From fecfe7f7b39c46745076ab4652af144f5e133c35 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Mon, 13 Mar 2017 14:22:42 +0000
Subject: [PATCH 01/68] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 main/admin/usergroups.php      |  38 +++++-----
 main/inc/lib/usergroup.lib.php | 124 ++++++++++++++++-----------------
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php
index de152d9afa..9ed8b4fd56 100755
--- a/main/admin/usergroups.php
+++ b/main/admin/usergroups.php
@@ -15,16 +15,16 @@ api_protect_limit_for_session_admin();
 //Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : null;
 if ($action == 'add') {
-    $interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
-    $interbreadcrumb[] = array('url' => '#','name' => get_lang('Add'));
+    $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
 } elseif ($action == 'edit') {
-    $interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
-    $interbreadcrumb[] = array('url' => '#','name' => get_lang('Edit'));
+    $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 } else {
-    $interbreadcrumb[] = array('url' => '#','name' => get_lang('Classes'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Classes'));
 }
 
 // The header.
@@ -55,13 +55,13 @@ $columns = array(
 );
 
 //Column config
-$column_model   = array(
-    array('name'=>'name',           'index'=>'name',        'width'=>'35',  'align'=>'left'),
-    array('name'=>'users',    		'index'=>'users', 		'width'=>'15',  'align'=>'left'),
-    array('name'=>'courses',    	'index'=>'courses', 	'width'=>'15',  'align'=>'left'),
-    array('name'=>'sessions',    	'index'=>'sessions', 	'width'=>'15',  'align'=>'left'),
-    array('name'=>'group_type',    	'index'=>'group_type', 	'width'=>'15',  'align'=>'center'),
-    array('name'=>'actions',        'index'=>'actions',     'width'=>'20',  'align'=>'center', 'sortable'=>'false','formatter'=>'action_formatter'),
+$column_model = array(
+    array('name'=>'name', 'index'=>'name', 'width'=>'35', 'align'=>'left'),
+    array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'),
+    array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'),
+    array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'),
+    array('name'=>'group_type', 'index'=>'group_type', 'width'=>'15', 'align'=>'center'),
+    array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'center', 'sortable'=>'false', 'formatter'=>'action_formatter'),
 );
 
 //Autowidth
@@ -73,11 +73,11 @@ $extra_params['sortorder'] = 'desc';
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
     return \''
-    .' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('user_to_class.png', get_lang('SubscribeUsersToClass'), null, ICON_SIZE_MEDIUM) . '</a>'
-    .' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('course_to_class.png', get_lang('SubscribeClassToCourses'), null, ICON_SIZE_MEDIUM) . '</a>'
-    .' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('sessions_to_class.png', get_lang('SubscribeClassToSessions'), null, ICON_SIZE_MEDIUM) . '</a>'
-    .' <a href="?action=edit&id=\'+options.rowId+\'">' . Display::return_icon('edit.png', get_lang('Edit'), null, ICON_SIZE_SMALL) . '</a>'
-    .' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'">' . Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_SMALL) . '</a>\';
+    .' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'">'.Display::return_icon('user_to_class.png', get_lang('SubscribeUsersToClass'), null, ICON_SIZE_MEDIUM).'</a>'
+    .' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'">'.Display::return_icon('course_to_class.png', get_lang('SubscribeClassToCourses'), null, ICON_SIZE_MEDIUM).'</a>'
+    .' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'">'.Display::return_icon('sessions_to_class.png', get_lang('SubscribeClassToSessions'), null, ICON_SIZE_MEDIUM).'</a>'
+    .' <a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), null, ICON_SIZE_SMALL).'</a>'
+    .' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_SMALL).'</a>\';
 }';
 
 ?>
@@ -135,7 +135,7 @@ if ($action == 'add') {
     } else {
         echo '<div class="actions">';
         echo '<a href="'.api_get_self().'">'.
-                Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
         $token = Security::get_token();
         $form->addElement('hidden', 'sec_token');
diff --git a/main/inc/lib/usergroup.lib.php b/main/inc/lib/usergroup.lib.php
index 9990a4fd55..dc8e2b1a3c 100755
--- a/main/inc/lib/usergroup.lib.php
+++ b/main/inc/lib/usergroup.lib.php
@@ -80,7 +80,7 @@ class UserGroup extends Model
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
 
                 return $row['count'];
             }
@@ -99,7 +99,7 @@ class UserGroup extends Model
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
                 return $row['count'];
             }
         }
@@ -124,7 +124,7 @@ class UserGroup extends Model
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
                 return $row['count'];
             }
 
@@ -145,7 +145,7 @@ class UserGroup extends Model
             ";
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
-                $row  = Database::fetch_array($result);
+                $row = Database::fetch_array($result);
                 return $row['count'];
             }
 
@@ -532,13 +532,13 @@ class UserGroup extends Model
                 INNER JOIN {$this->table} g
                 ON (u.usergroup_id = g.id)
                 ";
-            $where =  array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
+            $where = array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
         } else {
             $from = $this->usergroup_rel_user_table." u
                 INNER JOIN {$this->table} g
                 ON (u.usergroup_id = g.id)
                 ";
-            $where =  array('where' => array('user_id = ?' => $userId));
+            $where = array('where' => array('user_id = ?' => $userId));
         }
 
         if ($filterByType !== null) {
@@ -571,10 +571,10 @@ class UserGroup extends Model
             $urlId = api_get_current_access_url_id();
             $from = $this->usergroup_rel_user_table." u
                     INNER JOIN {$this->access_url_rel_usergroup} a ON (a.usergroup_id AND u.usergroup_id)";
-            $where =  array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
+            $where = array('where' => array('user_id = ? AND access_url_id = ? ' => array($userId, $urlId)));
         } else {
             $from = $this->usergroup_rel_user_table." u ";
-            $where =  array('where' => array('user_id = ?' => $userId));
+            $where = array('where' => array('user_id = ?' => $userId));
         }
 
         $results = Database::select(
@@ -894,7 +894,7 @@ class UserGroup extends Model
             }
             $result = $new_result;
         }
-        $columns = array('name', 'users', 'courses','sessions', 'group_type');
+        $columns = array('name', 'users', 'courses', 'sessions', 'group_type');
 
         if (!in_array($sidx, $columns)) {
             $sidx = 'name';
@@ -1297,7 +1297,7 @@ class UserGroup extends Model
                 }
             }
         }
-        $response->addAssign('ajax_list_courses','innerHTML', api_utf8_encode($return));
+        $response->addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
 
         return $response;
     }
@@ -1401,7 +1401,7 @@ class UserGroup extends Model
      * @param string style css
      * @return array with the file and the style of an image i.e $array['file'] $array['style']
      */
-    public function get_picture_group($id, $picture_file, $height, $size_picture = GROUP_IMAGE_SIZE_MEDIUM , $style = '')
+    public function get_picture_group($id, $picture_file, $height, $size_picture = GROUP_IMAGE_SIZE_MEDIUM, $style = '')
     {
         $picture = array();
         //$picture['style'] = $style;
@@ -1594,7 +1594,7 @@ class UserGroup extends Model
             GROUP_USER_PERMISSION_READER,
             GROUP_USER_PERMISSION_HRM,
         );
-        $user_role	= self::get_user_group_role($user_id, $group_id);
+        $user_role = self::get_user_group_role($user_id, $group_id);
         if (in_array($user_role, $roles)) {
             return true;
         } else {
@@ -1611,7 +1611,7 @@ class UserGroup extends Model
      * */
     public function get_user_group_role($user_id, $group_id)
     {
-        $table_group_rel_user= $this->usergroup_rel_user_table;
+        $table_group_rel_user = $this->usergroup_rel_user_table;
         $return_value = 0;
         if (!empty($user_id) && !empty($group_id)) {
             $sql = "SELECT relation_type FROM $table_group_rel_user
@@ -1619,8 +1619,8 @@ class UserGroup extends Model
                         usergroup_id = ".intval($group_id)." AND
                         user_id = ".intval($user_id)." ";
             $result = Database::query($sql);
-            if (Database::num_rows($result)>0) {
-                $row = Database::fetch_array($result,'ASSOC');
+            if (Database::num_rows($result) > 0) {
+                $row = Database::fetch_array($result, 'ASSOC');
                 $return_value = $row['relation_type'];
             }
         }
@@ -1675,7 +1675,7 @@ class UserGroup extends Model
         if (is_array($user_list) && is_array($group_list)) {
             foreach ($group_list as $group_id) {
                 foreach ($user_list as $user_id) {
-                    $role = self::get_user_group_role($user_id,$group_id);
+                    $role = self::get_user_group_role($user_id, $group_id);
                     if ($role == 0) {
                         $sql = "INSERT INTO $table_url_rel_group
 		               			SET
@@ -1706,7 +1706,7 @@ class UserGroup extends Model
     public function delete_user_rel_group($user_id, $group_id)
     {
         $table = $this->usergroup_rel_user_table;
-        $sql= "DELETE FROM $table
+        $sql = "DELETE FROM $table
                WHERE
                 user_id = ".intval($user_id)." AND
                 usergroup_id = ".intval($group_id)."  ";
@@ -1762,7 +1762,7 @@ class UserGroup extends Model
 
         $sql = "UPDATE $table_group_rel_user
    				SET relation_type = ".intval($relation_type)."
-                WHERE user_id = $user_id AND usergroup_id = $group_id" ;
+                WHERE user_id = $user_id AND usergroup_id = $group_id";
         Database::query($sql);
     }
 
@@ -1804,7 +1804,7 @@ class UserGroup extends Model
         if (Database::num_rows($result) > 0) {
             while ($row = Database::fetch_array($result, 'ASSOC')) {
                 if ($with_image) {
-                    $picture = self::get_picture_group($row['id'], $row['picture'],80);
+                    $picture = self::get_picture_group($row['id'], $row['picture'], 80);
                     $img = '<img src="'.$picture['file'].'" />';
                     $row['picture'] = $img;
                 }
@@ -1840,11 +1840,11 @@ class UserGroup extends Model
 				ORDER BY count DESC
 				LIMIT $num";
 
-        $result=Database::query($sql);
+        $result = Database::query($sql);
         $array = array();
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             if ($with_image) {
-                $picture = self::get_picture_group($row['id'], $row['picture'],80);
+                $picture = self::get_picture_group($row['id'], $row['picture'], 80);
                 $img = '<img src="'.$picture['file'].'" />';
                 $row['picture'] = $img;
             }
@@ -1889,11 +1889,11 @@ class UserGroup extends Model
                 ORDER BY created_at DESC
                 LIMIT $num ";
 
-        $result=Database::query($sql);
+        $result = Database::query($sql);
         $array = array();
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             if ($with_image) {
-                $picture = self::get_picture_group($row['id'], $row['picture'],80);
+                $picture = self::get_picture_group($row['id'], $row['picture'], 80);
                 $img = '<img src="'.$picture['file'].'" />';
                 $row['picture'] = $img;
             }
@@ -1927,7 +1927,7 @@ class UserGroup extends Model
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $group_id = intval($group_id);
 
-        if (empty($group_id)){
+        if (empty($group_id)) {
             return array();
         }
 
@@ -1942,9 +1942,9 @@ class UserGroup extends Model
             $where_relation_condition = '';
         } else {
             $new_relation_type = array();
-            foreach($relation_type as $rel) {
+            foreach ($relation_type as $rel) {
                 $rel = intval($rel);
-                $new_relation_type[] ="'$rel'";
+                $new_relation_type[] = "'$rel'";
             }
             $relation_type = implode(',', $new_relation_type);
             if (!empty($relation_type))
@@ -1988,7 +1988,7 @@ class UserGroup extends Model
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $group_id = intval($group_id);
 
-        if (empty($group_id)){
+        if (empty($group_id)) {
             return array();
         }
 
@@ -1999,7 +1999,7 @@ class UserGroup extends Model
 			    WHERE gu.usergroup_id= $group_id
 			    ORDER BY relation_type, firstname";
 
-        $result=Database::query($sql);
+        $result = Database::query($sql);
         $array = array();
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             $array[$row['id']] = $row;
@@ -2027,33 +2027,33 @@ class UserGroup extends Model
             case GROUP_USER_PERMISSION_READER:
                 // I'm just a reader
                 $relation_group_title = get_lang('IAmAReader');
-                $links .=  '<li class="'. ($show == 'invite_friends' ? 'active' : '') .'"><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
-                $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                            Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                $links .= '<li class="'.($show == 'invite_friends' ? 'active' : '').'"><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
+                $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                            Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 if (UserGroup::canLeave($group_info)) {
-                    $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                    $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 }
                 break;
             case GROUP_USER_PERMISSION_ADMIN:
                 $relation_group_title = get_lang('IAmAnAdmin');
-                $links .=  '<li class="'. ($show == 'group_edit' ? 'active' : '') .'"><a href="group_edit.php?id='.$group_id.'">'.
-                            Display::return_icon('group_edit.png', get_lang('EditGroup')) . get_lang('EditGroup') . '</a></li>';
-                $links .=  '<li class="'. ($show == 'member_list' ? 'active' : '') .'"><a href="group_waiting_list.php?id='.$group_id.'">'.
-                            Display::return_icon('waiting_list.png', get_lang('WaitingList')) . get_lang('WaitingList') . '</a></li>';
-                $links .=  '<li class="'. ($show == 'invite_friends' ? 'active' : '') .'"><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
+                $links .= '<li class="'.($show == 'group_edit' ? 'active' : '').'"><a href="group_edit.php?id='.$group_id.'">'.
+                            Display::return_icon('group_edit.png', get_lang('EditGroup')).get_lang('EditGroup').'</a></li>';
+                $links .= '<li class="'.($show == 'member_list' ? 'active' : '').'"><a href="group_waiting_list.php?id='.$group_id.'">'.
+                            Display::return_icon('waiting_list.png', get_lang('WaitingList')).get_lang('WaitingList').'</a></li>';
+                $links .= '<li class="'.($show == 'invite_friends' ? 'active' : '').'"><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
                 if (UserGroup::canLeave($group_info)) {
                     $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 }
                 break;
             case GROUP_USER_PERMISSION_PENDING_INVITATION:
 //				$links .=  '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('YouHaveBeenInvitedJoinNow').'</span></a></li>';
                 break;
             case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
-                $relation_group_title =  get_lang('WaitingForAdminResponse');
+                $relation_group_title = get_lang('WaitingForAdminResponse');
                 break;
             case GROUP_USER_PERMISSION_MODERATOR:
                 $relation_group_title = get_lang('IAmAModerator');
@@ -2061,28 +2061,28 @@ class UserGroup extends Model
                 //$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
                 //$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
                 if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
-                    $links .=  '<li><a href="group_waiting_list.php?id='.$group_id.'">'.
-                                Display::return_icon('waiting_list.png', get_lang('WaitingList')) . get_lang('WaitingList') . '</a></li>';
+                    $links .= '<li><a href="group_waiting_list.php?id='.$group_id.'">'.
+                                Display::return_icon('waiting_list.png', get_lang('WaitingList')).get_lang('WaitingList').'</a></li>';
                 }
-                $links .=  '<li><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
+                $links .= '<li><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
                 if (UserGroup::canLeave($group_info)) {
-                    $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                    $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                        Display::return_icon('group_leave.png', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 }
                 break;
             case GROUP_USER_PERMISSION_HRM:
                 $relation_group_title = get_lang('IAmAHRM');
                 $links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax" title="'.get_lang('ComposeMessage').'" data-size="lg" data-title="'.get_lang('ComposeMessage').'">'.
-                            Display::return_icon('new-message.png', get_lang('NewTopic')) . get_lang('NewTopic') . '</a></li>';
-                $links .=  '<li><a href="group_view.php?id='.$group_id.'">'.
-                            Display::return_icon('message_list.png', get_lang('MessageList')) . get_lang('MessageList') . '</a></li>';
-                $links .=  '<li><a href="group_invitation.php?id='.$group_id.'">'.
-                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')) . get_lang('InviteFriends') . '</a></li>';
-                $links .=  '<li><a href="group_members.php?id='.$group_id.'">'.
-                            Display::return_icon('member_list.png', get_lang('MemberList')) . get_lang('MemberList') . '</a></li>';
-                $links .=  '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
-                            Display::return_icon('delete_data.gif', get_lang('LeaveGroup')) . get_lang('LeaveGroup') . '</a></li>';
+                            Display::return_icon('new-message.png', get_lang('NewTopic')).get_lang('NewTopic').'</a></li>';
+                $links .= '<li><a href="group_view.php?id='.$group_id.'">'.
+                            Display::return_icon('message_list.png', get_lang('MessageList')).get_lang('MessageList').'</a></li>';
+                $links .= '<li><a href="group_invitation.php?id='.$group_id.'">'.
+                            Display::return_icon('invitation_friend.png', get_lang('InviteFriends')).get_lang('InviteFriends').'</a></li>';
+                $links .= '<li><a href="group_members.php?id='.$group_id.'">'.
+                            Display::return_icon('member_list.png', get_lang('MemberList')).get_lang('MemberList').'</a></li>';
+                $links .= '<li><a href="group_view.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.
+                            Display::return_icon('delete_data.gif', get_lang('LeaveGroup')).get_lang('LeaveGroup').'</a></li>';
                 break;
             default:
                 //$links .=  '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('JoinGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('JoinGroup').'</a></span></li>';
@@ -2174,7 +2174,7 @@ class UserGroup extends Model
         }
 
         $direction = 'ASC';
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'ASC';
         }
 
@@ -2185,8 +2185,8 @@ class UserGroup extends Model
         $sql .= " LIMIT $from,$number_of_items";
 
         $res = Database::query($sql);
-        if (Database::num_rows($res)> 0) {
-            while ($row = Database::fetch_array($res,'ASSOC')) {
+        if (Database::num_rows($res) > 0) {
+            while ($row = Database::fetch_array($res, 'ASSOC')) {
                 if (!in_array($row['id'], $return)) {
                     $return[$row['id']] = $row;
                 }
@@ -2211,7 +2211,7 @@ class UserGroup extends Model
             if ($i == $max_level) {
                 $select_part .= "rg$rg_number.group_id as id_$rg_number ";
             } else {
-                $select_part .="rg$rg_number.group_id as id_$rg_number, ";
+                $select_part .= "rg$rg_number.group_id as id_$rg_number, ";
             }
             if ($i == 1) {
                 $cond_part .= "FROM $t_rel_group rg0 LEFT JOIN $t_rel_group rg$i on rg$rg_number.group_id = rg$i.subgroup_id ";
@@ -2396,7 +2396,7 @@ class UserGroup extends Model
         $nameList = '<ul class="list-unstyled">';
 
         foreach ($groupsNameListParsed as $name) {
-            $nameList .= '<li>' . Display::span($name, ['class' => 'label label-info']) . '</li>';
+            $nameList .= '<li>'.Display::span($name, ['class' => 'label label-info']).'</li>';
         }
 
         $nameList .= '</ul>';

From 8b8e36895c75f9f7ed8ba95462b1c3bef0d44fc5 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 14 Mar 2017 11:37:58 -0500
Subject: [PATCH 02/68] Fix #1505 Show results for fill in blanks

---
 main/exercise/fill_blanks.class.php          | 43 ++++++++++++++------
 main/inc/lib/exercise_show_functions.lib.php |  2 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/main/exercise/fill_blanks.class.php b/main/exercise/fill_blanks.class.php
index b7a6b747cf..32f9b97cf4 100755
--- a/main/exercise/fill_blanks.class.php
+++ b/main/exercise/fill_blanks.class.php
@@ -1099,13 +1099,14 @@ class FillBlanks extends Question
     /**
      * return the HTML display of the answer
      * @param string $answer
-     * @param bool   $resultsDisabled
+     * @param int $feedbackType
+     * @param bool $resultsDisabled
      * @param bool $showTotalScoreAndUserChoices
-     *
      * @return string
      */
     public static function getHtmlDisplayForAnswer(
         $answer,
+        $feedbackType,
         $resultsDisabled = false,
         $showTotalScoreAndUserChoices = false
     ) {
@@ -1127,13 +1128,17 @@ class FillBlanks extends Question
                 $listStudentAnswerInfo['studentanswer'][$i] = self::getHtmlRightAnswer(
                     $listStudentAnswerInfo['studentanswer'][$i],
                     $listStudentAnswerInfo['tabwords'][$i],
-                    $resultsDisabled
+                    $feedbackType,
+                    $resultsDisabled,
+                    $showTotalScoreAndUserChoices
                 );
             } else {
                 $listStudentAnswerInfo['studentanswer'][$i] = self::getHtmlWrongAnswer(
                     $listStudentAnswerInfo['studentanswer'][$i],
                     $listStudentAnswerInfo['tabwords'][$i],
-                    $resultsDisabled
+                    $feedbackType,
+                    $resultsDisabled,
+                    $showTotalScoreAndUserChoices
                 );
             }
         }
@@ -1155,12 +1160,26 @@ class FillBlanks extends Question
      * @param string $answer
      * @param string $correct
      * @param string $right
-     * @param bool   $resultsDisabled
-     *
+     * @param int $feedbackType
+     * @param bool $resultsDisabled
+     * @param bool $showTotalScoreAndUserChoices
      * @return string
      */
-    public static function getHtmlAnswer($answer, $correct, $right, $resultsDisabled = false)
+    public static function getHtmlAnswer($answer, $correct, $right, $feedbackType, $resultsDisabled = false, $showTotalScoreAndUserChoices = false)
     {
+        $hideExpectedAnswer = false;
+        if ($feedbackType == 0 && ($resultsDisabled == RESULT_DISABLE_SHOW_SCORE_ONLY)) {
+            $hideExpectedAnswer = true;
+        }
+
+        if ($resultsDisabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT) {
+            if ($showTotalScoreAndUserChoices) {
+                $hideExpectedAnswer = false;
+            } else {
+                $hideExpectedAnswer = true;
+            }
+        }
+
         $style = "color: green";
         if (!$right) {
             $style = "color: red; text-decoration: line-through;";
@@ -1193,7 +1212,7 @@ class FillBlanks extends Question
                 $correctAnswerHtml = "<span style='color: green'>".$correct."</span>";
         }
 
-        if ($resultsDisabled) {
+        if ($hideExpectedAnswer) {
             $correctAnswerHtml = "<span title='".get_lang("ExerciseWithFeedbackWithoutCorrectionComment")."'> - </span>";
         }
 
@@ -1214,9 +1233,9 @@ class FillBlanks extends Question
      *
      * @return string
      */
-    public static function getHtmlRightAnswer($answer, $correct, $resultsDisabled = false)
+    public static function getHtmlRightAnswer($answer, $correct, $feedbackType, $resultsDisabled = false, $showTotalScoreAndUserChoices = false)
     {
-        return self::getHtmlAnswer($answer, $correct, true, $resultsDisabled);
+        return self::getHtmlAnswer($answer, $correct, true, $feedbackType, $resultsDisabled, $showTotalScoreAndUserChoices);
     }
 
     /**
@@ -1227,9 +1246,9 @@ class FillBlanks extends Question
      *
      * @return string
      */
-    public static function getHtmlWrongAnswer($answer, $correct, $resultsDisabled = false)
+    public static function getHtmlWrongAnswer($answer, $correct, $feedbackType, $resultsDisabled = false, $showTotalScoreAndUserChoices = false)
     {
-        return self::getHtmlAnswer($answer, $correct, false, $resultsDisabled);
+        return self::getHtmlAnswer($answer, $correct, false, $feedbackType, $resultsDisabled, $showTotalScoreAndUserChoices);
     }
 
     /**
diff --git a/main/inc/lib/exercise_show_functions.lib.php b/main/inc/lib/exercise_show_functions.lib.php
index fe2d46adbc..40657ce19e 100755
--- a/main/inc/lib/exercise_show_functions.lib.php
+++ b/main/inc/lib/exercise_show_functions.lib.php
@@ -37,7 +37,7 @@ class ExerciseShowFunctions
 	    $originalStudentAnswer = '',
 	    $showTotalScoreAndUserChoices
     ) {
-        $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $resultsDisabled, $showTotalScoreAndUserChoices);
+        $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $feedbackType, $resultsDisabled, $showTotalScoreAndUserChoices);
         if (strpos($originalStudentAnswer, 'font color') !== false) {
             $answerHTML = $originalStudentAnswer;
         }

From 8ccc30396ba0cae34f68a6f09afe48edf19ca157 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 14 Mar 2017 15:22:31 -0500
Subject: [PATCH 03/68] Avoid duplicated code - refs BT#12454

---
 main/announcements/announcements.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index f4da8a3afe..10cb93a007 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -432,21 +432,15 @@ switch ($action) {
             }
 
             $element = CourseManager::addUserGroupMultiSelect($form, array());
-            $form->setRequired($element);
-
-            if (!isset($announcement_to_modify)) {
-                $announcement_to_modify = '';
-            }
-
-            $form->addCheckBox('email_ann', '', get_lang('EmailOption'));
         } else {
-            if (!isset($announcement_to_modify)) {
-                $announcement_to_modify = '';
-            }
-
             $element = CourseManager::addGroupMultiSelect($form, $group_properties['iid'], array());
-            $form->setRequired($element);
-            $form->addCheckBox('email_ann', '', get_lang('EmailOption'));
+        }
+
+        $form->setRequired($element);
+        $form->addCheckBox('email_ann', '', get_lang('EmailOption'));
+
+        if (!isset($announcement_to_modify)) {
+            $announcement_to_modify = '';
         }
 
         $announcementInfo = AnnouncementManager::get_by_id($course_id, $id);

From 1697235826102bd41e5b5be55fb01b7eff53bc41 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 14 Mar 2017 16:11:26 -0500
Subject: [PATCH 04/68] Allow add description and help blocks for Advanced
 Settings Button - refs BT#12454

---
 .../pear/HTML/QuickForm/advanced_settings.php | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php b/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
index 5b6c86316a..3520952825 100755
--- a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
+++ b/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
@@ -45,15 +45,27 @@ class HTML_QuickForm_advanced_settings extends HTML_QuickForm_static
     {
         $name = $this->getAttribute('name');
         $text = $this->getAttribute('label');
+        $label = is_array($text) ? $text[0] : $text;
 
-        return '<div class="form-group">
-                    <label class="col-sm-2 control-label"></label>
-                    <div class="col-sm-10">
-                        <button id="' . $name . '" type="button" class="btn btn-default advanced_options"
-                                data-toggle="button" aria-pressed="false" autocomplete="off">
-                            <em class="fa fa-bars"></em> '.$text.'
-                        </button>
-                    </div>
-                 </div>';
+        $html = '<div class="form-group"><div class="col-sm-10 col-sm-offset-2">';
+
+        if (is_array($text) && isset($text[1])) {
+            $html .= '<span class="clearfix">'.$text[1].'</span>';
+        }
+
+        $html .= '           
+            <button id="'.$name.'" type="button" class="btn btn-default advanced_options"
+                    data-toggle="button" aria-pressed="false" autocomplete="off">
+                <em class="fa fa-bars"></em> '.$label.'
+            </button>
+        ';
+
+        if (is_array($text) && isset($text[2])) {
+            $html .= '<div class="help-block">'.$text[2].'</div>';
+        }
+
+        $html .= '</div></div>';
+
+        return $html;
     }
 }

From 3aa2f72e2cdf85da166d0cc6f808304bffe1a34a Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 14 Mar 2017 17:24:42 -0500
Subject: [PATCH 05/68] Allow sent announcements to all users in course/group -
 refs BT#12454

---
 main/announcements/announcements.php | 22 +++++++++++++++++++++-
 main/inc/lib/AnnouncementManager.php | 10 +++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 10cb93a007..6e8022d371 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -378,6 +378,9 @@ switch ($action) {
 
         $nameTools = $form_name;
         $form->addElement('header', $form_name);
+        $form->addButtonAdvancedSettings('choose_recipients', [get_lang('ChooseRecipients'), get_lang('AnnouncementChooseRecipientsDescription')]);
+        $form->addHtml('<div id="choose_recipients_options" style="display: none;">');
+
         $to = [];
         if (empty($group_id)) {
             if (isset($_GET['remind_inactive'])) {
@@ -436,7 +439,8 @@ switch ($action) {
             $element = CourseManager::addGroupMultiSelect($form, $group_properties['iid'], array());
         }
 
-        $form->setRequired($element);
+        $form->addHtml('</div>');
+//        $form->setRequired($element);
         $form->addCheckBox('email_ann', '', get_lang('EmailOption'));
 
         if (!isset($announcement_to_modify)) {
@@ -461,6 +465,21 @@ switch ($action) {
             }
         }
 
+        foreach ($defaults['users'] as $value) {
+            $parts = explode(':', $value);
+
+            if (isset($parts[1]) && !empty($parts[1])) {
+                $form->addHtml("
+                    <script>
+                        $(document).on('ready', function () {
+                            $('#choose_recipients').click();
+                        });
+                    </script>
+                ");
+                break;
+            }
+        }
+
         $defaults['email_ann'] = true;
 
         $form->addElement('text', 'title', get_lang('EmailTitle'));
@@ -500,6 +519,7 @@ switch ($action) {
 
         if ($form->validate()) {
             $data = $form->getSubmitValues();
+            $data['users'] = isset($data['users']) ? $data['users'] : ['everyone'];
 
             $sendToUsersInSession = isset($data['send_to_users_in_session']) ? true : false;
 
diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php
index ef4b79f3bc..d91b53a98e 100755
--- a/main/inc/lib/AnnouncementManager.php
+++ b/main/inc/lib/AnnouncementManager.php
@@ -1475,7 +1475,7 @@ class AnnouncementManager
                         // No group
                         $cond_user_id = " AND (
                             ip.lastedit_user_id = '".$user_id."' OR (
-                                ip.to_user_id='".$user_id."' OR
+                                (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) OR
                                 (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                             )
                         ) ";
@@ -1487,11 +1487,11 @@ class AnnouncementManager
                 } else {
                     if ($group_id == 0) {
                         $cond_user_id = " AND (
-                            ip.to_user_id = $user_id AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
+                            (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                         ) ";
                     } else {
                        $cond_user_id = " AND (
-                            ip.to_user_id = $user_id AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".$group_id."))
+                            (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".$group_id."))
                         )";
                     }
                 }
@@ -1514,10 +1514,10 @@ class AnnouncementManager
                     if ($allowUserEditSetting && !api_is_anonymous()) {
                         $cond_user_id = " AND (
                             ip.lastedit_user_id = '".api_get_user_id()."' OR
-                            (ip.to_user_id='".$user_id."' AND (ip.to_group_id='0' OR ip.to_group_id IS NULL))
+                            ((ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id='0' OR ip.to_group_id IS NULL))
                         ) ";
                     } else {
-                        $cond_user_id = " AND (ip.to_user_id='".$user_id."' AND (ip.to_group_id='0' OR ip.to_group_id IS NULL) ) ";
+                        $cond_user_id = " AND ((ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND (ip.to_group_id='0' OR ip.to_group_id IS NULL) ) ";
                     }
 
                     $sql = "SELECT $select

From 6b416a51fa226af8a3c673e37bced24edcd8c905 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 14 Mar 2017 17:44:34 -0500
Subject: [PATCH 06/68] Update dates in license file

---
 license.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/license.txt b/license.txt
index ebf52bd32f..be3ab6348e 100755
--- a/license.txt
+++ b/license.txt
@@ -1,11 +1,11 @@
 
 Chamilo LMS - elearning and course management software
 
-Copyright (c) 2008-2012 BeezNest Latino SAC, Peru & BeezNest Belgium SPRL, Belgium
+Copyright (c) 2008-2017 BeezNest Latino SAC, Peru & BeezNest Belgium SPRL, Belgium
 Copyright (c) 2012 Université de Genève, Switzerland
-Copyright (c) 2010-2012 Université de Grenoble, France
+Copyright (c) 2010-2017 Université de Grenoble, France
 Copyright (c) 2011-2012 CBlue SPRL, Belgium
-Copyright (c) Juan Carlos Raña (independent), Spain
+Copyright (c) 2004-2012 Juan Carlos Raña (independent), Spain
 Copyright (c) 2004-2009 Dokeos SPRL, Belgium
 Copyright (c) 2003-2007 Ghent University (UGent)
 Copyright (c) 2001-2004 Universite catholique de Louvain (UCL)

From 709c658a3ed6e575a7ce24c10fa4ef890db2991a Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 08:32:42 +0100
Subject: [PATCH 07/68] Avoid main folder

---
 .styleci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.styleci.yml b/.styleci.yml
index 1c4558c962..aa6de9bb73 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -14,6 +14,7 @@ finder:
   exclude:
     - 'app/cache/*'
     - 'app/logs/*'
+    - 'main/*'
     - 'documentation/*'
     - 'app/Migrations/*'
     - 'app/Resources/*'

From 341f542ba3ba7db52099092bb21662bb6c97d772 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 09:08:24 +0100
Subject: [PATCH 08/68] Avoid PHP warnings when using portuguese.

---
 main/inc/lib/internationalization.lib.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php
index 3a3322852b..09fd23c200 100755
--- a/main/inc/lib/internationalization.lib.php
+++ b/main/inc/lib/internationalization.lib.php
@@ -678,7 +678,16 @@ function date_to_str_ago($date, $timeZone = 'UTC')
     }
 
     $getOldTimezone = api_get_timezone();
-    $timeAgo = new TimeAgo($timeZone, api_get_language_isocode());
+
+    $isoCode = api_get_language_isocode();
+    if ($isoCode == 'pt') {
+        $isoCode = 'pt-BR';
+    }
+    $checkFile = api_get_path(SYS_PATH).'vendor/jimmiw/php-time-ago/translations/'.$isoCode.'.php';
+    if (!file_exists($checkFile)) {
+        $isoCode = 'en';
+    }
+    $timeAgo = new TimeAgo($timeZone, $isoCode);
     $value = $timeAgo->inWords($date);
 
     date_default_timezone_set($getOldTimezone);

From af1b9d246972e08612711ef5ca8e35a7b5fe3549 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 09:39:40 +0100
Subject: [PATCH 09/68] Avoid external libs

---
 .scrutinizer.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 54834d00a6..8f1169bf8a 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -163,3 +163,40 @@ tools:
             - 'tests/*'
         enabled: true
     php_code_coverage: true
+
+filter:
+      excluded_paths:
+        - 'app/cache/*'
+        - 'app/logs/*'
+        - 'documentation/*'
+        - 'app/Migrations/*'
+        - 'app/Resources/*'
+        - 'main/admin/db.php'
+        - 'main/auth/cas/lib/CAS/*'
+        - 'main/inc/lib/browser/*'
+        - 'main/inc/lib/freemindflashbrowser/*'
+        - 'main/inc/lib/internationalization_database/*'
+        - 'main/inc/lib/javascript/*'
+        - 'main/inc/lib/kses-0.2.2/*'
+        - 'main/inc/lib/mimetex/*'
+        - 'main/inc/lib/nanogong/*'
+        - 'main/inc/lib/nusoap/*'
+        - 'main/inc/lib/opengraph/*'
+        - 'main/inc/lib/ppt2png/*'
+        - 'main/inc/lib/phpseclib'
+        - 'main/inc/lib/pear/*'
+        - 'main/inc/lib/phpmailer/*'
+        - 'main/inc/lib/phpseclib/*'
+        - 'main/inc/lib/svg-edit/*'
+        - 'main/inc/lib/swfobject/*'
+        - 'main/inc/lib/wami-recorder/*'
+        - 'main/inc/lib/xajax/*'
+        - 'main/lp/packaging/*'
+        - 'main/template/*'
+        - 'main/img/*'
+        - 'main/lang/*'
+        - 'main/default_course_document'
+        - 'fonts'
+        - 'tests/*'
+        - 'vendor/*'
+        - 'web/*'

From d5719ce22647d4a177b1cd7bb4a1c8f37fb1654d Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 10:07:28 +0100
Subject: [PATCH 10/68] Minor - format code.

---
 main/inc/lib/tracking.lib.php | 34 +++++++++-------
 main/mySpace/myStudents.php   | 74 ++++++++++++++++++++++-------------
 2 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index b4b75b1a65..576a2571ec 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -2891,13 +2891,18 @@ class Tracking
 
     /**
      * This function gets last connection time to one learning path
-     * @param     int|array    Student id(s)
-     * @param     string         Course code
-     * @param     int         Learning path id
-     * @return     int         Total time
+     * @param int|array $student_id Student id(s)
+     * @param string $course_code      Course code
+     * @param int $lp_id    Learning path id
+     * @param int $session_id
+     * @return int         Total time
      */
-    public static function get_last_connection_time_in_lp($student_id, $course_code, $lp_id, $session_id = 0)
-    {
+    public static function get_last_connection_time_in_lp(
+        $student_id,
+        $course_code,
+        $lp_id,
+        $session_id = 0
+    ) {
         $course = CourseManager :: get_course_information($course_code);
         $student_id = intval($student_id);
         $lp_id = intval($lp_id);
@@ -2905,16 +2910,15 @@ class Tracking
         $session_id = intval($session_id);
 
         if (!empty($course)) {
-
-            $course_id	 = $course['real_id'];
-
-            $lp_table    = Database :: get_course_table(TABLE_LP_MAIN);
-            $t_lpv       = Database :: get_course_table(TABLE_LP_VIEW);
-            $t_lpiv      = Database :: get_course_table(TABLE_LP_ITEM_VIEW);
+            $course_id = $course['real_id'];
+            $lp_table = Database:: get_course_table(TABLE_LP_MAIN);
+            $t_lpv = Database:: get_course_table(TABLE_LP_VIEW);
+            $t_lpiv = Database:: get_course_table(TABLE_LP_ITEM_VIEW);
 
             // Check the real number of LPs corresponding to the filter in the
             // database (and if no list was given, get them all)
-            $res_row_lp = Database::query("SELECT id FROM $lp_table WHERE c_id = $course_id AND id = $lp_id ");
+            $sql = "SELECT id FROM $lp_table WHERE c_id = $course_id AND id = $lp_id ";
+            $res_row_lp = Database::query($sql);
             $count_row_lp = Database::num_rows($res_row_lp);
 
             // calculates last connection time
@@ -2922,7 +2926,7 @@ class Tracking
                 $sql = 'SELECT MAX(start_time)
                         FROM ' . $t_lpiv . ' AS item_view
                         INNER JOIN ' . $t_lpv . ' AS view
-                            ON item_view.lp_view_id = view.id
+                        ON (item_view.lp_view_id = view.id)
                         WHERE
                             item_view.c_id 		= '.$course_id.' AND
                             view.c_id 			= '.$course_id.' AND
@@ -2941,7 +2945,7 @@ class Tracking
 
     /**
      * gets the list of students followed by coach
-     * @param     int     Coach id
+     * @param     int     $coach_id Coach id
      * @return     array     List of students
      */
     public static function get_student_followed_by_coach($coach_id)
diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php
index 675c7f1803..140d4f6b1b 100755
--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@@ -1,6 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CourseBundle\Entity\CLp;
 /**
  * Implements the tracking of students in the Reporting pages
  * @package chamilo.reporting
@@ -74,7 +75,7 @@ if ($export) {
 $csv_content = array();
 $from_myspace = false;
 
-if (isset ($_GET['from']) && $_GET['from'] == 'myspace') {
+if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
     $from_myspace = true;
     $this_section = SECTION_TRACKING;
 } else {
@@ -203,7 +204,10 @@ switch ($action) {
         break;
     case 'delete_legal':
         $extraFieldValue = new ExtraFieldValue('user');
-        $value = $extraFieldValue->get_values_by_handler_and_field_variable($student_id, 'legal_accept');
+        $value = $extraFieldValue->get_values_by_handler_and_field_variable(
+            $student_id,
+            'legal_accept'
+        );
         $result = $extraFieldValue->delete($value['id']);
         if ($result) {
             Display::addFlash(Display::return_message(get_lang('Deleted')));
@@ -477,17 +481,19 @@ if (!empty($student_id)) {
     $coachs_name  = '';
     $session_name = '';
     $table_title = Display::return_icon(
-            'user.png',
-            get_lang('User'),
-            array(),
-            ICON_SIZE_SMALL
-        ).$user_info['complete_name'];
+        'user.png',
+        get_lang('User'),
+        array(),
+        ICON_SIZE_SMALL
+    ).$user_info['complete_name'];
 
     echo Display::page_subheader($table_title);
-
     $userPicture = UserManager::getUserPicture($user_info['user_id']);
     $userGroupManager = new UserGroup();
-    $userGroups = $userGroupManager->getNameListByUser($user_info['user_id'], UserGroup::NORMAL_CLASS);
+    $userGroups = $userGroupManager->getNameListByUser(
+        $user_info['user_id'],
+        UserGroup::NORMAL_CLASS
+    );
     ?>
     <img src="<?php echo $userPicture ?>">
     <div class="row">
@@ -503,9 +509,11 @@ if (!empty($student_id)) {
                 <td><?php echo get_lang('Name') . ' : '.$user_info['complete_name']; ?></td>
             </tr>
             <tr>
-                <td><?php echo get_lang('Email') . ' : ';
-                    if (!empty ($user_info['email'])) {
-                        echo '<a href="mailto:' . $user_info['email'] . '">' . $user_info['email'] . '</a>';
+                <td>
+                    <?php
+                    echo get_lang('Email') . ' : ';
+                    if (!empty($user_info['email'])) {
+                        echo '<a href="mailto:'.$user_info['email'].'">'.$user_info['email'].'</a>';
                     } else {
                         echo get_lang('NoEmail');
                     } ?>
@@ -513,7 +521,7 @@ if (!empty($student_id)) {
             </tr>
             <tr>
                 <td> <?php echo get_lang('Tel') . ' : ';
-                    if (!empty ($user_info['phone'])) {
+                    if (!empty($user_info['phone'])) {
                         echo $user_info['phone'];
                     } else {
                         echo get_lang('NoTel');
@@ -522,8 +530,10 @@ if (!empty($student_id)) {
                 </td>
             </tr>
             <tr>
-                <td> <?php echo get_lang('OfficialCode') . ' : ';
-                    if (!empty ($user_info['official_code'])) {
+                <td>
+                    <?php
+                    echo get_lang('OfficialCode').' : ';
+                    if (!empty($user_info['official_code'])) {
                         echo $user_info['official_code'];
                     } else {
                         echo get_lang('NoOfficialCode');
@@ -547,7 +557,10 @@ if (!empty($student_id)) {
 
             // Display timezone if the user selected one and if the admin allows the use of user's timezone
             $timezone = null;
-            $timezone_user = UserManager::get_extra_user_data_by_field($user_info['user_id'], 'timezone');
+            $timezone_user = UserManager::get_extra_user_data_by_field(
+                $user_info['user_id'],
+                'timezone'
+            );
             $use_users_timezone = api_get_setting('use_users_timezone', 'timezones');
             if ($timezone_user['timezone'] != null && $use_users_timezone == 'true') {
                 $timezone = $timezone_user['timezone'];
@@ -621,7 +634,6 @@ if (!empty($student_id)) {
 
             if (api_get_setting('allow_terms_conditions') === 'true') {
                 $isBoss = UserManager::userIsBossOfStudent(api_get_user_id(), $student_id);
-
                 if ($isBoss || api_is_platform_admin()) {
                     $extraFieldValue = new ExtraFieldValue('user');
                     $value = $extraFieldValue->get_values_by_handler_and_field_variable($student_id, 'legal_accept');
@@ -689,11 +701,11 @@ if (!empty($student_id)) {
             $access_end_date = '';
             $date_session = '';
             $title = Display::return_icon(
-                    'course.png',
-                    get_lang('Courses'),
-                    array(),
-                    ICON_SIZE_SMALL
-                ).' '.get_lang('Courses');
+                'course.png',
+                get_lang('Courses'),
+                array(),
+                ICON_SIZE_SMALL
+            ).' '.get_lang('Courses');
 
             $session_info = api_get_session_info($sId);
             if ($session_info) {
@@ -734,14 +746,22 @@ if (!empty($student_id)) {
                     $courseInfoItem = api_get_course_info_by_id($courseId);
                     $courseId = $courseInfoItem['real_id'];
                     $courseCodeItem = $courseInfoItem['code'];
-
-                    if (CourseManager :: is_user_subscribed_in_course($student_id, $courseCodeItem, true)) {
+                    $isSubscribed = CourseManager:: is_user_subscribed_in_course(
+                        $student_id,
+                        $courseCodeItem,
+                        true
+                    );
+                    if ($isSubscribed) {
                         $time_spent_on_course = api_time_to_hms(
                             Tracking :: get_time_spent_on_the_course($user_info['user_id'], $courseId, $sId)
                         );
 
                         // get average of faults in attendances by student
-                        $results_faults_avg = $attendance->get_faults_average_by_course($student_id, $courseCodeItem, $sId);
+                        $results_faults_avg = $attendance->get_faults_average_by_course(
+                            $student_id,
+                            $courseCodeItem,
+                            $sId
+                        );
                         if (!empty($results_faults_avg['total'])) {
                             if (api_is_drh()) {
                                 $attendances_faults_avg =
@@ -780,7 +800,7 @@ if (!empty($student_id)) {
                         $scoretotal_display = '0/0 (0%)';
                         if (!empty($scoretotal) && !empty($scoretotal[1])) {
                             $scoretotal_display =
-                                round($scoretotal[0], 1 ).'/'.
+                                round($scoretotal[0], 1).'/'.
                                 round($scoretotal[1], 1).
                                 ' ('.round(($scoretotal[0] / $scoretotal[1]) * 100, 2).' %)';
                         }
@@ -949,7 +969,7 @@ if (!empty($student_id)) {
                 <?php
 
                 $i = 0;
-                /** @var \Chamilo\CourseBundle\Entity\CLp $learnpath */
+                /** @var CLp $learnpath */
                 foreach ($lps as $learnpath) {
                     $lp_id = $learnpath->getId();
                     $lp_name = $learnpath->getName();

From 2aee4c0d14b8ea1f27d01645f5c76972071c6657 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 10:14:03 +0100
Subject: [PATCH 11/68] Improve queries

---
 main/inc/lib/tracking.lib.php | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index 576a2571ec..0c9b8a7ef3 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -2926,13 +2926,13 @@ class Tracking
                 $sql = 'SELECT MAX(start_time)
                         FROM ' . $t_lpiv . ' AS item_view
                         INNER JOIN ' . $t_lpv . ' AS view
-                        ON (item_view.lp_view_id = view.id)
+                        ON (item_view.lp_view_id = view.id AND item_view.c_id = view.c_id)
                         WHERE
-                            item_view.c_id 		= '.$course_id.' AND
-                            view.c_id 			= '.$course_id.' AND
-                            view.lp_id 			= '.$lp_id.'
-                            AND view.user_id 	= '.$student_id.'
-                            AND view.session_id = '.$session_id;
+                            item_view.c_id = '.$course_id.' AND
+                            view.c_id = '.$course_id.' AND
+                            view.lp_id = '.$lp_id.' AND 
+                            view.user_id = '.$student_id.' AND 
+                            view.session_id = '.$session_id;
                 $rs = Database::query($sql);
                 if (Database :: num_rows($rs) > 0) {
                     $last_time = Database :: result($rs, 0, 0);
@@ -2982,17 +2982,17 @@ class Tracking
         $result = Database::query($sql);
 
         while ($a_courses = Database::fetch_array($result)) {
-            $courseId = $a_courses["c_id"];
-            $id_session = $a_courses["session_id"];
+            $courseId = $a_courses['c_id'];
+            $id_session = $a_courses['session_id'];
 
             $sql = "SELECT DISTINCT srcru.user_id
-                    FROM $tbl_session_course_user AS srcru, $tbl_session_user sru
+                    FROM $tbl_session_course_user AS srcru 
+                    INNER JOIN $tbl_session_user sru
+                    ON (srcru.user_id = sru.user_id AND srcru.session_id = sru.session_id)
                     WHERE
-                        srcru.user_id = sru.user_id AND
-                        sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
-                        srcru.session_id = sru.session_id AND
+                        sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND                         
                         srcru.c_id = '$courseId' AND
-                        srcru.session_id='$id_session'";
+                        srcru.session_id = '$id_session'";
 
             $rs = Database::query($sql);
 
@@ -3019,16 +3019,16 @@ class Tracking
                 $sql = 'SELECT session_course_user.user_id
                         FROM ' . $tbl_session_course_user . ' as session_course_user
                         INNER JOIN     '.$tbl_session_user.' sru
-                            ON session_course_user.user_id = sru.user_id AND
-                               session_course_user.session_id = sru.session_id
+                        ON session_course_user.user_id = sru.user_id AND
+                           session_course_user.session_id = sru.session_id
                         INNER JOIN ' . $tbl_session_course . ' as session_course
-                            ON session_course.c_id = session_course_user.c_id AND
-                            session_course_user.session_id = session_course.session_id
+                        ON session_course.c_id = session_course_user.c_id AND
+                        session_course_user.session_id = session_course.session_id
                         INNER JOIN ' . $tbl_session . ' as session
-                            ON session.id = session_course.session_id AND
-                            session.id_coach = ' . $coach_id.'
+                        ON session.id = session_course.session_id AND
+                        session.id_coach = ' . $coach_id.'
                         INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url
-                            ON session.id = session_rel_url.session_id WHERE access_url_id = '.$access_url_id;
+                        ON session.id = session_rel_url.session_id WHERE access_url_id = '.$access_url_id;
             }
         }
 

From f44009af2f31ac066ad40b9b87c155c788522a68 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 10:27:41 +0100
Subject: [PATCH 12/68] Add deprecated

---
 main/inc/lib/course.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 4fda68d7ed..141507fa33 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -114,6 +114,7 @@ class CourseManager
      * Returns all the information of a given course code
      * @param string $course_code , the course code
      * @return array with all the fields of the course table
+     * @deprecated Use api_get_course_info() instead
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @assert ('') === false
      */

From c82c9525f583888e8c18bc63f801bade63dcda77 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 10:49:42 +0100
Subject: [PATCH 13/68] Replace api_is_allowed_to_create_course() with
 api_is_teacher()

If i'm a teacher but I cannot create courses, I'm still a teacher,
so I will need to have the Reporting instead of My progress.

See BT#12457
---
 main/inc/lib/banner.lib.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php
index 52c4d66ae5..cde143cdf5 100755
--- a/main/inc/lib/banner.lib.php
+++ b/main/inc/lib/banner.lib.php
@@ -36,9 +36,7 @@ function get_tabs($courseId = null)
     $navigation[SECTION_CATALOG]['key'] = 'catalog';
     $navigation[SECTION_CATALOG]['icon'] = 'catalog.png';
 
-
     // My Courses
-
     if (api_is_allowed_to_create_course()) {
         // Link to my courses for teachers
         $navigation['mycourses']['url'] = api_get_path(WEB_PATH).'user_portal.php?nosession=true';
@@ -50,7 +48,6 @@ function get_tabs($courseId = null)
     $navigation['mycourses']['key'] = 'my-course';
     $navigation['mycourses']['icon'] = 'my-course.png';
 
-
     // My Profile
     $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&amp;courseCode='.$_course['official_code'] : '' );
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
@@ -71,7 +68,7 @@ function get_tabs($courseId = null)
 	}
 
 	// Reporting
-	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+	if (api_is_teacher() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
         $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
@@ -292,13 +289,13 @@ function return_navigation_array()
 
         // Reporting
         if (api_get_setting('show_tabs', 'reporting') == 'true') {
-            if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin() || api_is_student_boss()) {
+            if (api_is_teacher() || api_is_drh() || api_is_session_admin() || api_is_student_boss()) {
                 $navigation['session_my_space'] = $possible_tabs['session_my_space'];
             } else {
                 $navigation['session_my_space'] = $possible_tabs['session_my_progress'];
             }
         } else {
-            if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin() || api_is_student_boss()) {
+            if (api_is_teacher() || api_is_drh() || api_is_session_admin() || api_is_student_boss()) {
                 $menu_navigation['session_my_space'] = $possible_tabs['session_my_space'];
             } else {
                 $menu_navigation['session_my_space'] = $possible_tabs['session_my_progress'];

From 6835810d7c21d2584686e0f50292fdc80ed1ff14 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 11:21:35 +0100
Subject: [PATCH 14/68] Disable analyzers

---
 .scrutinizer.yml | 63 ++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 8f1169bf8a..f916fb7c08 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -125,44 +125,39 @@ tools:
         extensions:
             - php
         command: phpmd
-        filter:
-            paths: {  }
-            excluded_paths:
-                - 'tests/*'
-                - 'vendor/*'
         config:
             rulesets:
                 - codesize
 
-    php_analyzer:
-        enabled: true
-        filter:
-            excluded_paths:
-                - 'tests/*'
-        extensions:
-            - php
-    php_code_sniffer:
-        enabled: true
-        config:
-            standard: PSR2
-        extensions:
-            - php
-        command: phpcs
-        filter:
-            excluded_paths:
-                - 'tests/*'
-    sensiolabs_security_checker:
-        enabled: true
-    php_pdepend:
-        command: pdepend
-        configuration_file:   ~
-        suffixes:
-            - php
-        excluded_dirs:
-            - 'vendor'
-            - 'tests/*'
-        enabled: true
-    php_code_coverage: true
+#    php_analyzer:
+#        enabled: true
+#        filter:
+#            excluded_paths:
+#                - 'tests/*'
+#        extensions:
+#            - php
+#    php_code_sniffer:
+#        enabled: true
+#        config:
+#            standard: PSR2
+#        extensions:
+#            - php
+#        command: phpcs
+#        filter:
+#            excluded_paths:
+#                - 'tests/*'
+#    sensiolabs_security_checker:
+#        enabled: true
+#    php_pdepend:
+#        command: pdepend
+#        configuration_file:   ~
+#        suffixes:
+#            - php
+#        excluded_dirs:
+#            - 'vendor'
+#            - 'tests/*'
+#        enabled: true
+#    php_code_coverage: true
 
 filter:
       excluded_paths:

From 8fd4492cff5e4b5ed6a94a73832999dd6c168878 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 11:45:51 +0100
Subject: [PATCH 15/68] Remove unused test code #1750

---
 tests/README.md                               |   17 -
 tests/api/README.txt                          |    1 -
 tests/behat/behat.yml                         |    2 +-
 tests/build.xml                               |  115 --
 tests/chamilotest.php                         |    6 -
 ...ternationalization.lib.test_standalone.php |   49 -
 tests/logs/code-browser/README.txt            |    1 -
 tests/logs/index.html                         |    4 -
 tests/logs/jdepend.xml                        |    0
 tests/logs/junit.xml                          |    0
 tests/main/admin/calendar.lib.test.php        |  101 --
 .../admin/statistics/statistics.lib.test.php  |  188 --
 tests/main/admin/sub_language.class.test.php  |  206 ---
 .../announcements/announcements.inc.test.php  |   43 -
 tests/main/auth/openid/xrds.lib.test.php      |   71 -
 tests/main/chat/chat_functions.lib.test.php   |   35 -
 tests/main/dropbox/dropbox_class.inc.test.php |  299 ----
 .../dropbox/dropbox_functions.inc.test.php    |  424 -----
 tests/main/exercice/answer.class.test.php     |  389 ----
 tests/main/exercice/exercise.class.test.php   |  539 ------
 tests/main/exercice/exercise.lib.test.php     |   42 -
 .../exercice/exercise_result.class.test.php   |   83 -
 .../export/exercise_import.inc.test.php       |   90 -
 .../export/qti2/qti2_classes.test.php         |  189 --
 .../exercice/export/qti2/qti2_export.test.php |   86 -
 .../export/scorm/scorm_classes.test.php       |  219 ---
 .../main/exercice/fill_blanks.class.test.php  |   45 -
 tests/main/exercice/freeanswer.class.test.php |   29 -
 tests/main/exercice/hotpotatoes.lib.test.php  |  178 --
 tests/main/forum/forumfunction.inc.test.php   | 1248 -------------
 .../lib/be/attendancelink.class.test.php      |  135 --
 .../gradebook/lib/be/category.class.test.php  |  423 -----
 .../lib/be/dropboxlink.class.test.php         |   42 -
 .../lib/be/evaluation.class.test.php          |  347 ----
 .../lib/be/exerciselink.class.test.php        |  153 --
 .../lib/be/forumthreadlink.class.test.php     |   42 -
 tests/main/inc/banner.inc.test.php            |   21 -
 tests/main/inc/course_document.lib.test.php   |   35 -
 ...edit_courses_to_url_functions.lib.test.php |   35 -
 ...dit_sessions_to_url_functions.lib.test.php |   32 -
 ...l_edit_users_to_url_functions.lib.test.php |   33 -
 .../main/inc/lib/add_course.lib.inc.test.php  |  132 --
 ...courses_to_sessions_functions.lib.test.php |   34 -
 ...session_to_category_functions.lib.test.php |   29 -
 tests/main/inc/lib/blog.lib.test.php          |  598 -------
 tests/main/inc/lib/database.lib.test.php      |  173 --
 tests/main/inc/lib/debug.lib.inc.test.php     |   65 -
 tests/main/inc/lib/display.lib.test.php       |  256 ---
 tests/main/inc/lib/document.lib.test.php      |  300 ----
 tests/main/inc/lib/events.lib.inc.test.php    |  150 --
 .../lib/exercise_show_functions.lib.test.php  |  121 --
 tests/main/inc/lib/export.lib.inc.test.php    |   73 -
 tests/main/inc/lib/fileDisplay.lib.test.php   |   75 -
 tests/main/inc/lib/fileManage.lib.test.php    |  123 --
 tests/main/inc/lib/fileManager.lib.test.php   |  129 --
 tests/main/inc/lib/fileUpload.lib.test.php    |  363 ----
 tests/main/inc/lib/geometry.lib.test.php      |    9 -
 tests/main/inc/lib/glossary.lib.test.php      |  157 --
 tests/main/inc/lib/groupmanager.lib.test.php  |  435 -----
 tests/main/inc/lib/image.lib.test.php         |  112 --
 tests/main/inc/lib/import.lib.test.php        |   16 -
 .../inc/lib/internationalization.lib.test.php | 1039 -----------
 tests/main/inc/lib/legal.lib.test.php         |   81 -
 tests/main/inc/lib/login.lib.test.php         |   82 -
 tests/main/inc/lib/mail.lib.inc.test.php      |   32 -
 tests/main/inc/lib/main_api.lib.test.php      |  707 --------
 .../inc/lib/main_api.lib.test_standalone.php  |  515 ------
 tests/main/inc/lib/message.lib.test.php       |   28 -
 tests/main/inc/lib/notebook.lib.test.php      |   87 -
 tests/main/inc/lib/online.inc.test.php        |   62 -
 tests/main/inc/lib/rmdirr.lib.test.php        |   72 -
 tests/main/inc/lib/security.lib.test.php      |   96 -
 .../inc/lib/session_handler.class.test.php    |  107 --
 .../main/inc/lib/sessionmanager.lib.test.php  |  140 --
 tests/main/inc/lib/social.lib.test.php        |  141 --
 .../inc/lib/sortable_table.class.test.php     |  165 --
 .../lib/specific_fields_manager.lib.test.php  |   99 --
 .../main/inc/lib/statsUtils.lib.inc.test.php  |   55 -
 tests/main/inc/lib/surveymanager.lib.test.php |  313 ----
 .../inc/lib/system_announcements.lib.test.php |  106 --
 tests/main/inc/lib/tablesort.lib.test.php     |   79 -
 tests/main/inc/lib/text.lib.test.php          |   71 -
 tests/main/inc/lib/tracking.lib.test.php      |  467 -----
 tests/main/inc/lib/urlmanager.lib.test.php    |  192 --
 tests/main/inc/lib/usermanager.lib.test.php   |  308 ----
 tests/main/inc/lib/xht.lib.test.php           |   85 -
 tests/main/inc/lib/xmd.lib.test.php           |  211 ---
 .../main/install/install_upgrade.lib.test.php |   55 -
 tests/main/mySpace/myspace.lib.test.php       |  213 ---
 tests/main/newscorm/learnpath.class.test.php  | 1400 ---------------
 .../newscorm/learnpathItem.class.test.php     |  593 -------
 .../openoffice_document.class.test.php        |    8 -
 .../openoffice_presentation.class.test.php    |   38 -
 .../newscorm/openoffice_text.class.test.php   |   50 -
 .../openoffice_text_document.class.test.php   |   47 -
 tests/main/newscorm/scorm.class.test.php      |  184 --
 tests/main/newscorm/scormItem.class.test.php  |   26 -
 .../newscorm/scormOrganization.class.test.php |   39 -
 .../newscorm/scormResource.class.test.php     |   30 -
 .../permissions_functions.inc.test.php        |  235 ---
 tests/main/search/search_suggestions.test.php |   18 -
 .../user_import/import.lib.test.php           |   53 -
 tests/main/work/work.lib.test.php             |  264 ---
 tests/main_api.lib.test_standalone.php        |   46 -
 tests/phpunit/README.txt                      |    4 -
 tests/phpunit/autoload.php                    |    2 -
 .../classes/AppendIteratorTest.class.php      |  136 --
 .../classes/ArrayIteratorTest.class.php       |  304 ----
 .../phpunit/classes/ArrayObjectTest.class.php |  280 ---
 .../classes/ConditionalLoginTest.class.php    |   52 -
 .../phpunit/classes/CustomPagesTest.class.php |   76 -
 tests/phpunit/classes/DateTimeTest.class.php  |  232 ---
 tests/phpunit/classes/DirectoryTest.class.php |   64 -
 tests/phpunit/classes/DisplayTest.lib.php     |  713 --------
 .../classes/EmptyIteratorTest.class.php       |   88 -
 .../classes/ErrorExceptionTest.class.php      |   40 -
 .../phpunit/classes/EventsMailTest.class.php  |   52 -
 tests/phpunit/classes/ExceptionTest.class.php |  124 --
 tests/phpunit/classes/ImportTest.class.php    |   52 -
 tests/phpunit/classes/LocaleTest.class.php    |  244 ---
 .../classes/LoginRedirectionTest.class.php    |   40 -
 .../classes/MultipleIteratorTest.class.php    |  160 --
 .../phpunit/classes/NormalizerTest.class.php  |   52 -
 tests/phpunit/classes/RightsTest.class.php    |   52 -
 .../classes/SessionHandlerTest.class.php      |  136 --
 tests/phpunit/classes/SessionManager.lib.php  |  532 ------
 tests/phpunit/classes/TableSortTest.class.php |   52 -
 .../classes/UserApiKeyManagerTest.class.php   |   88 -
 tests/phpunit/classes/XMLReaderTest.class.php |  328 ----
 tests/phpunit/classes/XMLWriterTest.class.php |  532 ------
 .../phpunit/classes/ZipArchiveTest.class.php  |  388 ----
 tests/phpunit/classes/finfoTest.class.php     |   64 -
 .../classes/php_user_filterTest.class.php     |   64 -
 tests/phpunit/generate_test_classes.php       |   33 -
 tests/phpunit/phpunit.xml                     |   24 -
 tests/rmdirr.lib.test_standalone.php          |   50 -
 tests/run.sh                                  |    3 -
 tests/scripts/packaging/README.md             |   12 -
 tests/scripts/packaging/gitlog.php            |  126 --
 .../HELP_MY_TESTS_DONT_WORK_ANYMORE           |  348 ----
 tests/simpletest/LICENSE                      |  502 ------
 tests/simpletest/README                       |  108 --
 tests/simpletest/VERSION                      |    1 -
 tests/simpletest/authentication.php           |  238 ---
 tests/simpletest/autorun.php                  |   87 -
 tests/simpletest/browser.php                  | 1098 ------------
 tests/simpletest/collector.php                |  122 --
 tests/simpletest/compatibility.php            |  175 --
 tests/simpletest/cookies.php                  |  380 ----
 tests/simpletest/default_reporter.php         |  133 --
 tests/simpletest/detached.php                 |   96 -
 tests/simpletest/dumper.php                   |  360 ----
 tests/simpletest/eclipse.php                  |  307 ----
 tests/simpletest/encoding.php                 |  552 ------
 tests/simpletest/errors.php                   |  288 ---
 tests/simpletest/exceptions.php               |  198 ---
 tests/simpletest/expectation.php              |  895 ----------
 tests/simpletest/extensions/index.html        |    8 -
 .../simpletest/extensions/pear_test_case.php  |  198 ---
 .../extensions/phpunit_test_case.php          |   96 -
 tests/simpletest/extensions/testdox.php       |   42 -
 .../simpletest/extensions/testdox/index.html  |    8 -
 tests/simpletest/extensions/testdox/test.php  |  108 --
 tests/simpletest/form.php                     |  355 ----
 tests/simpletest/frames.php                   |  596 -------
 tests/simpletest/http.php                     |  624 -------
 tests/simpletest/index.html                   |    8 -
 tests/simpletest/invoker.php                  |  139 --
 tests/simpletest/mock_objects.php             | 1581 -----------------
 tests/simpletest/page.php                     |  983 ----------
 tests/simpletest/parser.php                   |  765 --------
 tests/simpletest/reflection_php4.php          |  136 --
 tests/simpletest/reflection_php5.php          |  380 ----
 tests/simpletest/remote.php                   |  117 --
 tests/simpletest/reporter.php                 |  473 -----
 tests/simpletest/scorer.php                   |  863 ---------
 tests/simpletest/selector.php                 |  137 --
 tests/simpletest/shell_tester.php             |  334 ----
 tests/simpletest/simpletest.php               |  478 -----
 tests/simpletest/socket.php                   |  218 ---
 tests/simpletest/tag.php                      | 1418 ---------------
 tests/simpletest/test_case.php                |  709 --------
 tests/simpletest/unit_tester.php              |  420 -----
 tests/simpletest/url.php                      |  528 ------
 tests/simpletest/user_agent.php               |  332 ----
 tests/simpletest/web_tester.php               | 1541 ----------------
 tests/simpletest/xml.php                      |  647 -------
 tests/simpletest_to_junit.xsl                 |   47 -
 tests/test_manager.inc.php                    |  206 ---
 tests/test_suite.php                          |  191 --
 tests/test_webservices.php                    |  182 --
 191 files changed, 1 insertion(+), 43940 deletions(-)
 delete mode 100755 tests/api/README.txt
 delete mode 100755 tests/build.xml
 delete mode 100755 tests/chamilotest.php
 delete mode 100755 tests/internationalization.lib.test_standalone.php
 delete mode 100755 tests/logs/code-browser/README.txt
 delete mode 100755 tests/logs/index.html
 delete mode 100755 tests/logs/jdepend.xml
 delete mode 100755 tests/logs/junit.xml
 delete mode 100755 tests/main/admin/calendar.lib.test.php
 delete mode 100755 tests/main/admin/statistics/statistics.lib.test.php
 delete mode 100755 tests/main/admin/sub_language.class.test.php
 delete mode 100755 tests/main/announcements/announcements.inc.test.php
 delete mode 100755 tests/main/auth/openid/xrds.lib.test.php
 delete mode 100755 tests/main/chat/chat_functions.lib.test.php
 delete mode 100755 tests/main/dropbox/dropbox_class.inc.test.php
 delete mode 100755 tests/main/dropbox/dropbox_functions.inc.test.php
 delete mode 100755 tests/main/exercice/answer.class.test.php
 delete mode 100755 tests/main/exercice/exercise.class.test.php
 delete mode 100755 tests/main/exercice/exercise.lib.test.php
 delete mode 100755 tests/main/exercice/exercise_result.class.test.php
 delete mode 100755 tests/main/exercice/export/exercise_import.inc.test.php
 delete mode 100755 tests/main/exercice/export/qti2/qti2_classes.test.php
 delete mode 100755 tests/main/exercice/export/qti2/qti2_export.test.php
 delete mode 100755 tests/main/exercice/export/scorm/scorm_classes.test.php
 delete mode 100755 tests/main/exercice/fill_blanks.class.test.php
 delete mode 100755 tests/main/exercice/freeanswer.class.test.php
 delete mode 100755 tests/main/exercice/hotpotatoes.lib.test.php
 delete mode 100755 tests/main/forum/forumfunction.inc.test.php
 delete mode 100755 tests/main/gradebook/lib/be/attendancelink.class.test.php
 delete mode 100755 tests/main/gradebook/lib/be/category.class.test.php
 delete mode 100755 tests/main/gradebook/lib/be/dropboxlink.class.test.php
 delete mode 100755 tests/main/gradebook/lib/be/evaluation.class.test.php
 delete mode 100755 tests/main/gradebook/lib/be/exerciselink.class.test.php
 delete mode 100755 tests/main/gradebook/lib/be/forumthreadlink.class.test.php
 delete mode 100755 tests/main/inc/banner.inc.test.php
 delete mode 100755 tests/main/inc/course_document.lib.test.php
 delete mode 100755 tests/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php
 delete mode 100755 tests/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php
 delete mode 100755 tests/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php
 delete mode 100755 tests/main/inc/lib/add_course.lib.inc.test.php
 delete mode 100755 tests/main/inc/lib/add_courses_to_sessions_functions.lib.test.php
 delete mode 100755 tests/main/inc/lib/add_many_session_to_category_functions.lib.test.php
 delete mode 100755 tests/main/inc/lib/blog.lib.test.php
 delete mode 100755 tests/main/inc/lib/database.lib.test.php
 delete mode 100755 tests/main/inc/lib/debug.lib.inc.test.php
 delete mode 100755 tests/main/inc/lib/display.lib.test.php
 delete mode 100755 tests/main/inc/lib/document.lib.test.php
 delete mode 100755 tests/main/inc/lib/events.lib.inc.test.php
 delete mode 100755 tests/main/inc/lib/exercise_show_functions.lib.test.php
 delete mode 100755 tests/main/inc/lib/export.lib.inc.test.php
 delete mode 100755 tests/main/inc/lib/fileDisplay.lib.test.php
 delete mode 100755 tests/main/inc/lib/fileManage.lib.test.php
 delete mode 100755 tests/main/inc/lib/fileManager.lib.test.php
 delete mode 100755 tests/main/inc/lib/fileUpload.lib.test.php
 delete mode 100755 tests/main/inc/lib/geometry.lib.test.php
 delete mode 100755 tests/main/inc/lib/glossary.lib.test.php
 delete mode 100755 tests/main/inc/lib/groupmanager.lib.test.php
 delete mode 100755 tests/main/inc/lib/image.lib.test.php
 delete mode 100755 tests/main/inc/lib/import.lib.test.php
 delete mode 100755 tests/main/inc/lib/internationalization.lib.test.php
 delete mode 100755 tests/main/inc/lib/legal.lib.test.php
 delete mode 100755 tests/main/inc/lib/login.lib.test.php
 delete mode 100755 tests/main/inc/lib/mail.lib.inc.test.php
 delete mode 100755 tests/main/inc/lib/main_api.lib.test.php
 delete mode 100755 tests/main/inc/lib/main_api.lib.test_standalone.php
 delete mode 100755 tests/main/inc/lib/message.lib.test.php
 delete mode 100755 tests/main/inc/lib/notebook.lib.test.php
 delete mode 100755 tests/main/inc/lib/online.inc.test.php
 delete mode 100755 tests/main/inc/lib/rmdirr.lib.test.php
 delete mode 100755 tests/main/inc/lib/security.lib.test.php
 delete mode 100755 tests/main/inc/lib/session_handler.class.test.php
 delete mode 100755 tests/main/inc/lib/sessionmanager.lib.test.php
 delete mode 100755 tests/main/inc/lib/social.lib.test.php
 delete mode 100755 tests/main/inc/lib/sortable_table.class.test.php
 delete mode 100755 tests/main/inc/lib/specific_fields_manager.lib.test.php
 delete mode 100755 tests/main/inc/lib/statsUtils.lib.inc.test.php
 delete mode 100755 tests/main/inc/lib/surveymanager.lib.test.php
 delete mode 100755 tests/main/inc/lib/system_announcements.lib.test.php
 delete mode 100755 tests/main/inc/lib/tablesort.lib.test.php
 delete mode 100755 tests/main/inc/lib/text.lib.test.php
 delete mode 100755 tests/main/inc/lib/tracking.lib.test.php
 delete mode 100755 tests/main/inc/lib/urlmanager.lib.test.php
 delete mode 100755 tests/main/inc/lib/usermanager.lib.test.php
 delete mode 100755 tests/main/inc/lib/xht.lib.test.php
 delete mode 100755 tests/main/inc/lib/xmd.lib.test.php
 delete mode 100755 tests/main/install/install_upgrade.lib.test.php
 delete mode 100755 tests/main/mySpace/myspace.lib.test.php
 delete mode 100755 tests/main/newscorm/learnpath.class.test.php
 delete mode 100755 tests/main/newscorm/learnpathItem.class.test.php
 delete mode 100755 tests/main/newscorm/openoffice_document.class.test.php
 delete mode 100755 tests/main/newscorm/openoffice_presentation.class.test.php
 delete mode 100755 tests/main/newscorm/openoffice_text.class.test.php
 delete mode 100755 tests/main/newscorm/openoffice_text_document.class.test.php
 delete mode 100755 tests/main/newscorm/scorm.class.test.php
 delete mode 100755 tests/main/newscorm/scormItem.class.test.php
 delete mode 100755 tests/main/newscorm/scormOrganization.class.test.php
 delete mode 100755 tests/main/newscorm/scormResource.class.test.php
 delete mode 100755 tests/main/permissions/permissions_functions.inc.test.php
 delete mode 100755 tests/main/search/search_suggestions.test.php
 delete mode 100755 tests/main/webservices/user_import/import.lib.test.php
 delete mode 100755 tests/main/work/work.lib.test.php
 delete mode 100755 tests/main_api.lib.test_standalone.php
 delete mode 100755 tests/phpunit/README.txt
 delete mode 100755 tests/phpunit/autoload.php
 delete mode 100755 tests/phpunit/classes/AppendIteratorTest.class.php
 delete mode 100755 tests/phpunit/classes/ArrayIteratorTest.class.php
 delete mode 100755 tests/phpunit/classes/ArrayObjectTest.class.php
 delete mode 100755 tests/phpunit/classes/ConditionalLoginTest.class.php
 delete mode 100755 tests/phpunit/classes/CustomPagesTest.class.php
 delete mode 100755 tests/phpunit/classes/DateTimeTest.class.php
 delete mode 100755 tests/phpunit/classes/DirectoryTest.class.php
 delete mode 100755 tests/phpunit/classes/DisplayTest.lib.php
 delete mode 100755 tests/phpunit/classes/EmptyIteratorTest.class.php
 delete mode 100755 tests/phpunit/classes/ErrorExceptionTest.class.php
 delete mode 100755 tests/phpunit/classes/EventsMailTest.class.php
 delete mode 100755 tests/phpunit/classes/ExceptionTest.class.php
 delete mode 100755 tests/phpunit/classes/ImportTest.class.php
 delete mode 100755 tests/phpunit/classes/LocaleTest.class.php
 delete mode 100755 tests/phpunit/classes/LoginRedirectionTest.class.php
 delete mode 100755 tests/phpunit/classes/MultipleIteratorTest.class.php
 delete mode 100755 tests/phpunit/classes/NormalizerTest.class.php
 delete mode 100755 tests/phpunit/classes/RightsTest.class.php
 delete mode 100755 tests/phpunit/classes/SessionHandlerTest.class.php
 delete mode 100755 tests/phpunit/classes/SessionManager.lib.php
 delete mode 100755 tests/phpunit/classes/TableSortTest.class.php
 delete mode 100755 tests/phpunit/classes/UserApiKeyManagerTest.class.php
 delete mode 100755 tests/phpunit/classes/XMLReaderTest.class.php
 delete mode 100755 tests/phpunit/classes/XMLWriterTest.class.php
 delete mode 100755 tests/phpunit/classes/ZipArchiveTest.class.php
 delete mode 100755 tests/phpunit/classes/finfoTest.class.php
 delete mode 100755 tests/phpunit/classes/php_user_filterTest.class.php
 delete mode 100755 tests/phpunit/generate_test_classes.php
 delete mode 100755 tests/phpunit/phpunit.xml
 delete mode 100755 tests/rmdirr.lib.test_standalone.php
 delete mode 100755 tests/run.sh
 delete mode 100644 tests/scripts/packaging/README.md
 delete mode 100644 tests/scripts/packaging/gitlog.php
 delete mode 100755 tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
 delete mode 100755 tests/simpletest/LICENSE
 delete mode 100755 tests/simpletest/README
 delete mode 100755 tests/simpletest/VERSION
 delete mode 100755 tests/simpletest/authentication.php
 delete mode 100755 tests/simpletest/autorun.php
 delete mode 100755 tests/simpletest/browser.php
 delete mode 100755 tests/simpletest/collector.php
 delete mode 100755 tests/simpletest/compatibility.php
 delete mode 100755 tests/simpletest/cookies.php
 delete mode 100755 tests/simpletest/default_reporter.php
 delete mode 100755 tests/simpletest/detached.php
 delete mode 100755 tests/simpletest/dumper.php
 delete mode 100755 tests/simpletest/eclipse.php
 delete mode 100755 tests/simpletest/encoding.php
 delete mode 100755 tests/simpletest/errors.php
 delete mode 100755 tests/simpletest/exceptions.php
 delete mode 100755 tests/simpletest/expectation.php
 delete mode 100755 tests/simpletest/extensions/index.html
 delete mode 100755 tests/simpletest/extensions/pear_test_case.php
 delete mode 100755 tests/simpletest/extensions/phpunit_test_case.php
 delete mode 100755 tests/simpletest/extensions/testdox.php
 delete mode 100755 tests/simpletest/extensions/testdox/index.html
 delete mode 100755 tests/simpletest/extensions/testdox/test.php
 delete mode 100755 tests/simpletest/form.php
 delete mode 100755 tests/simpletest/frames.php
 delete mode 100755 tests/simpletest/http.php
 delete mode 100755 tests/simpletest/index.html
 delete mode 100755 tests/simpletest/invoker.php
 delete mode 100755 tests/simpletest/mock_objects.php
 delete mode 100755 tests/simpletest/page.php
 delete mode 100755 tests/simpletest/parser.php
 delete mode 100755 tests/simpletest/reflection_php4.php
 delete mode 100755 tests/simpletest/reflection_php5.php
 delete mode 100755 tests/simpletest/remote.php
 delete mode 100755 tests/simpletest/reporter.php
 delete mode 100755 tests/simpletest/scorer.php
 delete mode 100755 tests/simpletest/selector.php
 delete mode 100755 tests/simpletest/shell_tester.php
 delete mode 100755 tests/simpletest/simpletest.php
 delete mode 100755 tests/simpletest/socket.php
 delete mode 100755 tests/simpletest/tag.php
 delete mode 100755 tests/simpletest/test_case.php
 delete mode 100755 tests/simpletest/unit_tester.php
 delete mode 100755 tests/simpletest/url.php
 delete mode 100755 tests/simpletest/user_agent.php
 delete mode 100755 tests/simpletest/web_tester.php
 delete mode 100755 tests/simpletest/xml.php
 delete mode 100755 tests/simpletest_to_junit.xsl
 delete mode 100755 tests/test_manager.inc.php
 delete mode 100755 tests/test_suite.php
 delete mode 100755 tests/test_webservices.php

diff --git a/tests/README.md b/tests/README.md
index 8271cb6547..2a803dd229 100755
--- a/tests/README.md
+++ b/tests/README.md
@@ -49,24 +49,10 @@ Behat-specific folder
 
 Attempt at keeping a track of what Chamilo looked like over time.
 
-### logs
-
-Meant as a destination for all logs generated by automated testing and building
-scripts. Should be writeable whenever tests (other than behat) are run (clover
-and stuff like that). Initially used when Chamilo was using its own Jenkins
-setup (now it tries to use Travis-CI).
-
-### main
-
-Deprecated PHPUnit code reflecting the internal code structure of Chamilo
-
 ### migrations
 
 Combination of unofficial scripts to execute migrations from other systems
 
-### phpunit
-
-Deprecated PHPUnit code
 
 ### procedures
 
@@ -78,9 +64,6 @@ Chamilo.
 A collection of scripts used to fix or improve some things globally in Chamilo
 portals. Mostly for old versions.
 
-### simpletest
-
-Deprecated SimpleTest code (unused since 2009)
 
 ### translations
 
diff --git a/tests/api/README.txt b/tests/api/README.txt
deleted file mode 100755
index 694178c7fa..0000000000
--- a/tests/api/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory will contain the auto-generated PHPDoc files
diff --git a/tests/behat/behat.yml b/tests/behat/behat.yml
index 8b88e16c7d..d77c9d512b 100644
--- a/tests/behat/behat.yml
+++ b/tests/behat/behat.yml
@@ -1,7 +1,7 @@
 default:
     extensions:
         Behat\MinkExtension:
-          base_url: http://localhost/
+          base_url: http://localhost/chamilo_111/
           goutte: ~
           show_cmd: 'open %s'
           selenium2:
diff --git a/tests/build.xml b/tests/build.xml
deleted file mode 100755
index d71096cef4..0000000000
--- a/tests/build.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="Chamilo LMS" default="build">
- <target name="build"
-   depends="prepare,phpunit,pdepend,phpdoc"/>
-
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/../tests/api"/>
-  <delete dir="${basedir}/../tests/code-browser"/>
-  <delete dir="${basedir}/../tests/coverage"/>
-  <delete dir="${basedir}/../tests/logs"/>
-  <delete dir="${basedir}/../tests/pdepend"/>
- </target>
-
- <target name="prepare" depends="clean" description="Prepare for build">
-  <mkdir dir="${basedir}/../tests/api"/>
-  <mkdir dir="${basedir}/../tests/code-browser"/>
-  <mkdir dir="${basedir}/../tests/coverage"/>
-  <mkdir dir="${basedir}/../tests/logs"/>
-  <mkdir dir="${basedir}/../tests/pdepend"/>
-  <mkdir dir="${basedir}/../tests/phpdox"/>
- </target>
-
- <target name="lint" description="Perform syntax check of sourcecode files">
-   <apply executable="php" failonerror="true">
-     <arg value="-l" />
-
-     <fileset dir="${basedir}/../main">
-       <include name="**/*.php"/>
-     </fileset>
-
-     <fileset dir="${basedir}">
-       <include name="**/*.php"/>
-     </fileset>
-
-   </apply>
- </target>
-
- <target name="pdepend" description="Calculate software metrics using PHP_Depend">
-  <exec executable="pdepend">
-   <arg value="--jdepend-xml=${basedir}/tests/logs/jdepend.xml" />
-   <arg value="--jdepend-chart=${basedir}/tests/pdepend/dependencies.svg" />
-   <arg value="--overview-pyramid=${basedir}/tests/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}" />
-  </exec>
- </target>
-
- <target name="phpmd"
-         description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
-  <exec executable="phpmd">
-   <arg path="${basedir}" />
-   <arg value="text" />
-   <arg value="${basedir}/tests/phpmd.xml" />
-  </exec>
- </target>
-
- <target name="phpmd-ci" description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
-  <exec executable="phpmd">
-   <arg path="${basedir}" />
-   <arg value="xml" />
-   <arg value="${basedir}/tests/phpmd.xml" />
-   <arg value="--reportfile" />
-   <arg value="${basedir}/tests/logs/pmd.xml" />
-  </exec>
- </target>
-
- <target name="phpcs"
-         description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
-  <exec executable="phpcs">
-   <arg value="--standard=${basedir}/tests/phpcs.xml" />
-   <arg path="${basedir}" />
-  </exec>
- </target>
-
- <target name="phpcs-ci" description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
-  <exec executable="phpcs" output="/dev/null">
-   <arg value="--report=checkstyle" />
-   <arg value="--report-file=${basedir}/tests/logs/checkstyle.xml" />
-   <arg value="--standard=${basedir}/tests/phpcs.xml" />
-   <arg path="${basedir}" />
-  </exec>
- </target>
-
- <!--target name="simpletest" description="Run simpletests">
-   <simpletest>
-     <formatter type="plain"/>
-     <fileset dir="${basedir}/tests">
-       <include name="test_suite.php"/>
-     </fileset>
-   </simpletest>
- </target-->
-
- <target name="phpunit" description="Run unit tests with PHPUnit" depends="lint">
-   <!--exec executable="phpunit" failonerror="true"-->
-   <exec executable="phpunit">
-     <arg line="-c ${basedir}/phpunit/phpunit.xml" />
-   </exec>
- </target>
-
- <target name="phpdoc" description="Generate API documentation">
-   <exec executable="phpdoc">
-     <arg line="-d ${basedir}/../ -t ${basedir}/logs/docs -ti ChamiloLMS -i archive/,home/,entity/,symfony/,phpdocx/,phpqrcode/,mpdf/,transliteration/*,phpmailer/*,htmlpurifier/,formvalidator/*,app/upload/users/,lang/,app/courses/,main/inc/lib/internationalization_database/,.htaccess -ct covers,assert" />
-   </exec>
- </target>
- <target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
-  <exec executable="phpcb">
-   <arg value="--log" />
-   <arg path="${basedir}/tests/logs" />
-   <arg value="--source" />
-   <arg path="${basedir}" />
-   <arg value="--output" />
-   <arg path="${basedir}/tests/code-browser" />
-  </exec>
- </target>
-</project>
diff --git a/tests/chamilotest.php b/tests/chamilotest.php
deleted file mode 100755
index 7334954dec..0000000000
--- a/tests/chamilotest.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php require_once('../main/inc/global.inc.php');
-
-var_dump(api_is_windows_os());
-
-//echo (api_is_windows_os()?'true':'false');
-?>
\ No newline at end of file
diff --git a/tests/internationalization.lib.test_standalone.php b/tests/internationalization.lib.test_standalone.php
deleted file mode 100755
index 6d09a54fb0..0000000000
--- a/tests/internationalization.lib.test_standalone.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * A standalone test for the internationalization library.
- * @author Ricardo Rodriguez Salazar, 2009.
- * @author Ivan Tcholakov, September 2009.
- * For licensing terms, see /license.txt
- */
-
-//ini_set('memory_limit','128M');
-
-$_current_dir = dirname(__FILE__).'/';
-
-$_sys_code_path = $_current_dir.'../main/';
-$_sys_include_path = $_sys_code_path.'inc/';
-$_sys_library_path = $_sys_code_path.'inc/lib/';
-
-$_test_sys_code_path = $_current_dir.'main/';
-$_test_sys_include_path = $_test_sys_code_path.'inc/';
-$_test_sys_library_path = $_test_sys_code_path.'inc/lib/';
-
-
-require_once($_current_dir.'simpletest/unit_tester.php');
-
-require_once($_sys_include_path.'global.inc.php');
-
-//header('Content-Type: text/html; charset=' . $charset);
-header('Content-Type: text/html; charset=' . 'UTF-8');
-
-require_once($_current_dir.'simpletest/web_tester.php');
-require_once($_current_dir.'simpletest/mock_objects.php');
-require_once($_current_dir.'simpletest/autorun.php');
-
-$_SESSION['_user']['user_id'] = 1;
-
-class InternationalizationTests extends TestSuite {
-
-    function  InternationalizationTests() {
-        $this->TestSuite('Internationalization Tests');
-
-        global $_test_sys_library_path;
-		$this->addTestFile($_test_sys_library_path.'internationalization.lib.test.php');
-    }
-
-}
-
-$test = & new InternationalizationTests();
-//$test-> run( new HtmlReporter());
-
-?>
diff --git a/tests/logs/code-browser/README.txt b/tests/logs/code-browser/README.txt
deleted file mode 100755
index d6699499b7..0000000000
--- a/tests/logs/code-browser/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Code browser report will be generated in this directory
diff --git a/tests/logs/index.html b/tests/logs/index.html
deleted file mode 100755
index 7879e1ce9f..0000000000
--- a/tests/logs/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body>
-</body>
-</html>
diff --git a/tests/logs/jdepend.xml b/tests/logs/jdepend.xml
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/tests/logs/junit.xml b/tests/logs/junit.xml
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/tests/main/admin/calendar.lib.test.php b/tests/main/admin/calendar.lib.test.php
deleted file mode 100755
index 9aa473c871..0000000000
--- a/tests/main/admin/calendar.lib.test.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-class TestCalendar extends UnitTestCase
-{
-	public function TestCalendar(){
-		$this->UnitTestCase('Admin calendar library - main/admin/calendar.inc.test.php');
-	}
-	public function testToJavascript(){
-		$res = to_javascript();
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
- 	public function testAddWeek(){
- 		$timestamp=12;
- 		$num=1;
- 		$res = add_week($timestamp,$num);
- 		$this->assertTrue(is_numeric($res));
- 		//var_dump($res);
- 	}
-
- 	public function testAddMonth(){
- 		$timestamp=5;
- 		$num=1;
- 		$res = add_month($timestamp,$num);
- 		$this->assertTrue(is_numeric($res));
- 		//var_dump($res);
- 	}
-
- 	public function testAddYear(){
- 		$timestamp=9999;
- 		$num=1;
- 		$res = add_year($timestamp,$num);
- 		$this->assertTrue(is_numeric($res));
- 		//var_dump($res);
- 	}
-
-
-/**
- * Adds a repetitive item to the database
- * @param   array   Course info
- * @param   int     The original event's id
- * @param   string  Type of repetition
- * @param   int     Timestamp of end of repetition (repeating until that date)
- * @param   array   Original event's destination
- * @return  boolean False if error, True otherwise
- */
-
- 	public function testAgendaAddRepeatItem(){
- 		//this function is not used or deprecated
- 	}
-
- 	public function testCalculateStartEndOfWeek(){
- 		$week_number=4;
- 		$year=2011;
- 		$res = calculate_start_end_of_week($week_number, $year);
- 		$this->assertTrue(is_array($res));
- 		$this->assertTrue($res);
- 		//var_dump($res);
- 	}
-
-
- 	public function testGetDayAgendaitems() {
- 		$courses_dbs=array();
- 		$month=01;
- 		$year=2010;
- 		$day='1';
- 		$res = get_day_agendaitems($courses_dbs, $month, $year, $day);
- 		$this->assertTrue(is_array($res));
- 	}
-
-	public function testDeleteAgendaItem(){
-		$id=1;
-		$res = delete_agenda_item($id);
-		$this->assertTrue(is_bool($res));
- 	}
- 	 	public function testDisplayMinimonthcalendar(){
- 		ob_start();
- 		global $DaysShort;
- 		$agendaitems=array('test','test2');
- 		$month=01;
- 		$year=2010;
- 		$monthName='';
- 		$res = display_minimonthcalendar($agendaitems, $month, $year, $monthName);
- 		ob_end_clean();
- 		$this->assertTrue(is_null($res));
- 		//var_dump($res);
- 	}
-
- 	public function testShowUserFilterForm(){
-		ob_start();
- 		$res = show_user_filter_form();
- 		ob_end_clean();
- 		$this->assertTrue(is_null($res));
- 	}
-
- 	public function testIsRepeatedEvent() {
-	//This is deprecated or not used
- 	}
-}
diff --git a/tests/main/admin/statistics/statistics.lib.test.php b/tests/main/admin/statistics/statistics.lib.test.php
deleted file mode 100755
index df6e22febd..0000000000
--- a/tests/main/admin/statistics/statistics.lib.test.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-class TestStatistics extends UnitTestCase
-{
-
-    public function TestStatistics()
-    {
-        $this->UnitTestCase('this File test the provides some function for statistics ');
-    }
-
-    public function setUp()
-    {
-        $this->statisc = new Statistics();
-    }
-
-    public function tearDown()
-    {
-        $this->statisc = null;
-    }
-
-    public function testMakeSizeString()
-    {
-        $size = 20960000;
-        $res = Statistics::makeSizeString($size);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    /**
-     * Count courses
-     * @param string $category_code Code of a course category. Default: count
-     * all courses.
-     * @return int Number of courses counted
-     */
-    public function testCountCourses()
-    {
-        $res = Statistics::countCourses();
-        $this->assertTrue(is_numeric($res));
-        //var_dump($res);
-    }
-
-    public function testCountUsers()
-    {
-        $user_id = '1';
-        $category_code = null;
-        $course_code = 'ABC';
-        $firstName = 'Jhon';
-        $lastName = 'Doe';
-        $status = '1';
-        $email = 'localhost@localhost.com';
-        $loginName = 'admin';
-        $password = 'admin';
-        $count_invisible_courses = true;
-        $res = Statistics::countUsers($status, $category_code,
-            $count_invisible_courses);
-        $this->assertTrue(is_numeric($res));
-        $this->assertTrue(count($res) === 0 || count($res) !== 0);
-    }
-
-    public function testGetNumberOfActivities()
-    {
-        $resu = Statistics::getNumberOfActivities();
-        if (!is_null($resu)) {
-            $this->assertTrue(is_numeric($resu));
-            $this->assertTrue(count($resu) == 0 || count($resu) !== 0);
-        }
-    }
-
-    /**
-     * Get activities data to display
-     */
-    public function testGetActivitiesData()
-    {
-        global $dateTimeFormatLong;
-        $from = 0;
-        $number_of_items = 30;
-        $column = '';
-        $direction = 'ASC';
-        $resu = Statistics::getActivitiesData($from, $number_of_items, $column,
-            $direction);
-        $this->assertTrue(is_array($resu));
-    }
-
-    /**
-     * Get all course categories
-     * @return array All course categories (code => name)
-     */
-    public function testGetCourseCategories()
-    {
-        $res = Statistics::getCourseCategories();
-        $this->assertTrue($res);
-        //var_dump($res);
-    }
-
-    public function testRescale()
-    {
-        $data = array('test', 'test2', 'test3');
-        $max = 500;
-        $res = Statistics::rescale($data, $max);
-        $this->assertTrue($res);
-        $this->assertTrue(is_array($res));
-        //var_dump($res);
-    }
-
-    public function testPrintStats()
-    {
-        ob_start();
-        $title = 'testing';
-        $stats = array('test', 'test2', 'test3');
-        $show_total = true;
-        $is_file_size = false;
-        $res = Statistics::printStats(
-            $title,
-            $stats,
-            $show_total = true,
-            $is_file_size = false
-        );
-        ob_end_clean();
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    public function testPrintLoginStats()
-    {
-        ob_start();
-        $type = 'month';
-        $resu = Statistics::printLoginStats($type);
-        ob_end_clean();
-        $this->assertTrue(is_null($resu));
-        //var_dump($resu);
-    }
-
-    public function testPrintRecentLoginStats()
-    {
-        ob_start();
-        $res = Statistics::printRecentLoginStats();
-        ob_end_clean();
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    public function testPrintToolStats()
-    {
-        ob_start();
-        $resu = Statistics::printToolStats();
-        ob_end_clean();
-        $this->assertTrue(is_null($resu));
-    }
-
-    public function testPrintCourseByLanguageStats()
-    {
-        ob_start();
-        $resu = Statistics::printCourseByLanguageStats();
-        ob_end_clean();
-        $this->assertTrue(is_null($resu));
-        //var_dump($resu);
-    }
-
-    public function testPrintUserPicturesStats()
-    {
-        ob_start();
-        $resu = Statistics::printUserPicturesStats();
-        ob_end_clean();
-        $this->assertTrue(is_null($resu));
-    }
-
-    public function testPrintActivitiesStats()
-    {
-        ob_start();
-        $res = Statistics::printActivitiesStats();
-        ob_end_clean();
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    public function testPrintCourseLastVisit()
-    {
-        ob_start();
-        $column = '';
-        $direction = '';
-        $parameters['action'] = 'courselastvisit';
-        $res = Statistics::printCourseLastVisit();
-        ob_end_clean();
-        $this->assertTrue(is_null($res));
-    }
-}
-
-?>
diff --git a/tests/main/admin/sub_language.class.test.php b/tests/main/admin/sub_language.class.test.php
deleted file mode 100755
index 2f267c6331..0000000000
--- a/tests/main/admin/sub_language.class.test.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-class TestSubLanguageManager extends UnitTestCase
-{
-	public $clean = array();
-
-        public function __construct() {
-            $this->UnitTestCase('Sublanguage Manager library - main/admin/sub_language.class.test.php');
-        }
-	/**
-	 *	Testing who get all data of lang folder
-	 *  @param String to url path folder
-	 *  @param bool true if we only want the subname
-	 *  @return Array All file of lang folder
-	 */
-	public function testget_lang_folder_files_list(){
-		$path = api_get_path(SYS_LANG_PATH).'english';
-		$res = SubLanguageManager::get_lang_folder_files_list($path, $only_main_name = false);
-		$this->assertTrue(is_array($res));
-		$this->assertTrue(count($res)>0);
-	}
-
-	/**
-	 *
-	 *
-	 */
-	public function testget_all_information_of_sub_language(){
-		$parent_id = 13;
-		$language_id = 10;
-		$res = SubLanguageManager::get_all_information_of_sub_language($parent_id, $language_id);
-        // under normal circumstances, there is no language 10 child of language 13
-		$this->assertFalse($res);
-	}
-
-    /**
-	 *
-	 */
-	public function testget_all_information_of_language(){
-		$parent_id = 11;
-		$res = SubLanguageManager::get_all_information_of_language($parent_id);
-		$this->assertTrue(is_array($res));
-	}
-
-	/**
-	 * Get variables within a language file
-	 */
-	public function testget_all_language_variable_in_file(){
-	    $system_path_folder = api_get_path(SYS_LANG_PATH);
-	    $system_path_file = $system_path_folder.'spanish/link.inc.php';
-	    $res = SubLanguageManager::get_all_language_variable_in_file($system_path_file);
-	    $this->assertTrue(is_array($res));
-	}
-
-    /**
-     * Add directory for sub-language
-     * @param String The sub-language path directory ( /var/www/my_lms/main/lang/spanish_corporate )
-     * @return boolean
-     */
-    public function testadd_language_directory() {
-        $res = SubLanguageManager :: add_language_directory('test');
-        $this->assertTrue($res);
-        $res = SubLanguageManager :: remove_language_directory('test');
-    }
-
-	/**
-	 *
-	 */
-	public function testadd_file_in_language_directory(){
-        $res = SubLanguageManager :: add_language_directory('test');
-        $this->assertTrue($res);
-		$system_path_file = api_get_path(SYS_LANG_PATH).'test/spanish.inc.php';
-		$res = SubLanguageManager::add_file_in_language_directory($system_path_file);
-		$this->assertTrue($res);
-        $res = SubLanguageManager :: remove_language_directory('test');
-	}
-
-	public function testwrite_data_in_file(){
-		$dirname = api_get_path(SYS_LANG_PATH);
-    	$file = $dirname.'spanish.inc.php';
-		$path_file = $file;
-		$new_sub_language='spanishtest';
-		$variable_sub_language='test';
-		$res = SubLanguageManager::write_data_in_file($path_file,$new_sub_language,$variable_sub_language);
-		$this->assertTrue($res);
-	}
-
-	/**
-	 * Delete sub language of database
-	 * @param Integer id's.
-	 * @return null
- 	 */
-	public function Testremove_sub_language() {
-		$parent_id = '';
-		$sub_language_id = 1;
-		$res = SubLanguageManager :: remove_sub_language($parent_id, $sub_language_id);
-		$this->assertFalse($res);
-		//	var_dump($res);
-	}
-
-	/**
-	 * Test of Check if language exist by id
-	 * @param Integer
-	 * @return Boolean
-	 */
-	public function Testcheck_if_exist_language_by_id() {
-		$language_id = 14;
-		$res = SubLanguageManager :: check_if_exist_language_by_id($language_id);
-		$this->assertTrue($res);
-		//	var_dump($res);
-	}
-
-	/**
-	 * Show the name of language by id
-	 * @param Integer id
-	 * @return String the name of language
-	 */
-	public function Testget_name_of_language_by_id() {
-		$language_id = 13;
-        $tbl_admin_languages    = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql='SELECT original_name FROM '.$tbl_admin_languages.' WHERE id=13';
-        $rs=Database::query($sql);
-        $name ='';
-        if (Database::num_rows($rs)>0) {
-            $name = Database::result($rs,0,'original_name');
-        }
-		$res = SubLanguageManager :: get_name_of_language_by_id($language_id);
-		$this->assertEqual($res,$name,'The language name from function does not match the database value');
-	}
-
-	/**
-	 * Verified if language is an sub-language
-	 * @param Integer
-	 * @return Boolean
-	 */
-	public function Testcheck_if_language_is_sub_language_for_non_existing_sublanguage() {
-		$language_id = 112;
-		$res = SubLanguageManager :: check_if_language_is_sub_language($language_id);
-		$this->assertFalse($res);
-		//	var_dump($res);
-	}
-
-	/**
-	 *
-	 */
-	public function Testcheck_if_language_is_father() {
-		$language_id = 12;
-		$res = SubLanguageManager :: check_if_language_is_father($language_id);
-		$this->assertFalse($res);
-		//	var_dump($res);
-	}
-
-	/**
-	 *
-	 */
-	public function Testmake_language_unavailable_and_back() {
-		$language_id = 11;
-		$res = SubLanguageManager :: make_unavailable_language($language_id);
-		$this->assertTrue($res,'Language could not be made unavailable');
-        $res = SubLanguageManager :: make_available_language($language_id);
-		// var_dump($res);
-	}
-
-	/**
-	 *
-	 */
-	public function Testmake_available_language() {
-		$language_id= 11;
-        $res = SubLanguageManager :: make_unavailable_language($language_id);
-		$res = SubLanguageManager :: make_available_language ($language_id);
-        $this->assertTrue($res,'Language could not be made available');
-		// var_dump($res);
-	}
-	/**
-	 *
-	 *
-	 */
-	public function Testset_platform_language_empty(){
-        $backup = SubLanguageManager :: get_platform_language_id();
-		$language_id = '';
-		$res = SubLanguageManager :: set_platform_language($language_id);
-		$this->assertFalse($res);
-        $res = SubLanguageManager :: set_platform_language($backup);
-		// var_dump($res);
-	}
-    public function Testset_platform_language_2(){
-        $backup = SubLanguageManager :: get_platform_language_id();
-        $language_id = 2;
-        $res = SubLanguageManager :: set_platform_language($language_id);
-        $this->assertTrue($res);
-        $res = SubLanguageManager :: set_platform_language($backup);
-        // var_dump($res);
-    }
-	/**
-	 *
-	 *
-	 */
-	public function Testremove_directory_of_sub_language(){
-        $res = SubLanguageManager :: remove_language_directory('test');
-        // create a directory of sub language
-		$res = SubLanguageManager :: add_language_directory('test');
-		$this->assertTrue($res);
-		$res = SubLanguageManager :: remove_language_directory('test');
-        // var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/announcements/announcements.inc.test.php b/tests/main/announcements/announcements.inc.test.php
deleted file mode 100755
index 6893c5e323..0000000000
--- a/tests/main/announcements/announcements.inc.test.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-class TestAnnouncements extends UnitTestCase {
-
-    function TestAnnouncements(){
-        $this->UnitTestCase('Displays one specific announcement test');
-    }
-
-
-    public function Testget_course_users(){
-        $_SESSION['id_session'] = 'CURSO1';
-        $user_list = CourseManager::get_real_and_linked_user_list(api_get_course_id(), true, $_SESSION['id_session']);
-        $res = get_course_users();
-        if($res = array($res)){
-        $this->assertTrue(is_array($res));
-        } else {
-        $this->assertTrue(is_null($res));
-        }
-        //var_dump($res);
-    }
-
-    public function Testget_course_groups(){
-        $_SESSION['id_session']='CURSO1';
-        $new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), intval($_SESSION['id_session']));
-        $res = get_course_groups();
-        $this->assertFalse($res);
-        $this->assertTrue(is_array($res));
-        var_dump($res);
-    }
-
-    public function Testload_edit_users(){
-        $_SESSION['id_session']='CURSO1';
-        global $_course;
-        global $tbl_item_property;
-        $tbl_item_property 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
-        $tool = '';
-        $id = '';
-        $res = load_edit_users($tool, $id);
-        $this->assertTrue(is_null($res));
-        var_dump($res);
-    }
-}
diff --git a/tests/main/auth/openid/xrds.lib.test.php b/tests/main/auth/openid/xrds.lib.test.php
deleted file mode 100755
index ad5ae85726..0000000000
--- a/tests/main/auth/openid/xrds.lib.test.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-require_once(api_get_path(SYS_CODE_PATH).'auth/openid/xrds.lib.php');
-
-class TestXrds extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('XRDS library for OpenID - main/auth/openid/xrds.lib.test.php');
-    }
-	/*
-	function testxrds_cdata() {
-		global $xrds_open_elements, $xrds_services, $xrds_current_service;
-		$parser='';
-		$data='';
-		$res=_xrds_cdata(&$parser, $data);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	*/
-
-	function testxrdsparse() {
-
-		$xml = <<<XML
-		<xml version="1.0">
-		<users>
-		<fname>Christian</fname>
-		<lname>Fasa Fasa</lname>
-		</users>
-XML;
-
-		$parser = xrds_parse($xml);
-		if (is_resource($parser)) {
-			$this->assertTrue(is_resource($parser));
-		} else {
-			$this->assertTrue(is_null($parser));
-		}
-	}
-/*
-	function test_xrds_element_end() {
-		 global $xrds_open_elements, $xrds_services, $xrds_current_service;
-		 $parser='';
-		 $name='';
-		 $xrds_current_service['version'] = 2;
-		 $xrds_current_service['version'] = 1;
-		 $xrds_services[] = $xrds_current_service;
-		 $xrds_current_service= array();
-		 $res=_xrds_element_end(&$parser, $name);
-		 $this->assertTrue(is_null($res));
-		 //var_dump($xrds_current_service);
-	}
-
-	function test_xrds_element_start() {
-
-		global $xrds_open_elements;
-
-		$name='';
-		$attribs='';
-
-		$res=_xrds_element_start(&$parser, $name, $attribs);
-
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function test_xrds_strip_namespace() {
-		$name='';
-		$res=_xrds_strip_namespace($name);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}*/
-}
-?>
diff --git a/tests/main/chat/chat_functions.lib.test.php b/tests/main/chat/chat_functions.lib.test.php
deleted file mode 100755
index c10a8dfb5c..0000000000
--- a/tests/main/chat/chat_functions.lib.test.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
-
-class TestChatFunctions extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('Chat library - main/chat/chat_functions.lib.test.php');
-    }
-
-	public function setUp() {
-		$this->tcourse = new CourseManager();
-	}
-
-	public function tearDown() {
-		$this->tcourse = null;
-	}
-
-	function CreateChatConnection($database_name) {
-		$session_id = 1;
-		$tbl_chat_connected = Database::get_main_table(TABLE_MAIN_CHAT);
-		$sql = "SELECT user_id FROM $tbl_chat_connected WHERE user_id = 1";
-		$result = Database::query($sql);
-		//The user_id exists so we must do an UPDATE and not a INSERT
-		$current_time = date('Y-m-d H:i:s');
-		if (Database::num_rows($result)==0) {
-			$query="INSERT INTO $tbl_chat_connected(user_id,last_connection,session_id)
-					VALUES(1,'$current_time','$session_id')";
-		} else {
-			$query="UPDATE $tbl_chat_connected set last_connection='".$current_time."'
-					WHERE user_id=1 AND session_id='$session_id'";
-		}
-		Database::query($query);
-	}
-}
-?>
diff --git a/tests/main/dropbox/dropbox_class.inc.test.php b/tests/main/dropbox/dropbox_class.inc.test.php
deleted file mode 100755
index c96dffe41d..0000000000
--- a/tests/main/dropbox/dropbox_class.inc.test.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-class TestDropbox extends UnitTestCase {
-
-	public $ddropboxwork;
-	public $ddropboxsentwork;
-	public $dperson;
-
-	public function TestDropbox() {
-	$this->UnitTestCase('');
-	}
-
-	public function setUp() {
-		global $dropbox_cnf;
-		$dropbox_cnf['tbl_post'] 		= Database::get_course_table(TABLE_DROPBOX_POST);
-		$dropbox_cnf['tbl_file'] 		= Database::get_course_table(TABLE_DROPBOX_FILE);
-		$dropbox_cnf['tbl_person'] 		= Database::get_course_table(TABLE_DROPBOX_PERSON);
-		$dropbox_cnf['tbl_intro'] 		= Database::get_course_table(TABLE_TOOL_INTRO);
-		$dropbox_cnf['tbl_user'] 		= Database::get_main_table(TABLE_MAIN_USER);
-		$dropbox_cnf['tbl_course_user']	= Database::get_main_table(TABLE_MAIN_COURSE_USER);
-		$dropbox_cnf['tbl_category'] 	= Database::get_course_table(TABLE_DROPBOX_CATEGORY);
-		$dropbox_cnf['tbl_feedback'] 	= Database::get_course_table(TABLE_DROPBOX_FEEDBACK);
-		$this->ddropboxwork = new Dropbox_Work(1);
-		$this->ddropboxsentwork = new Dropbox_SentWork(1);
-		$this->dperson = new Dropbox_Person(1, 1, 1);
-	}
-
-	public function tearDown() {
-		$this-> ddropboxwork = null;
-		$this-> ddropboxsentwork = null;
-		$this-> dperson = null;
-	}
-
-//Class Dropbox_Work
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @return Dropbox_Work
-	 */
-
-	function testDropbox_Work() {
-		$arg1=1;
-		$resu= $this->ddropboxwork->Dropbox_Work($arg1, $arg2=null, $arg3=null, $arg4=null, $arg5=null, $arg6=null);
-		$this->assertTrue(is_null($resu));
-        //var_dump($resu);
-	}
-
-	/**
-	 * private function creating a new work object
-	 *
-	 * @param unknown_type $uploader_id
-	 * @param unknown_type $title
-	 * @param unknown_type $description
-	 * @param unknown_type $author
-	 * @param unknown_type $filename
-	 * @param unknown_type $filesize
-	 *
-	 * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
-	 * 			As a consequence this parameter can be removed
-	 */
-
-	function testCreateNewWork() {
-		global $dropbox_cnf;
-		$uploader_id=1;
-		$title='test';
-		$description = 'testing';
-		$author= 'test';
-		$filename='test.txt';
-		$filesize=125;
-		$resu= $this->ddropboxwork->_createNewWork($uploader_id, $title, $description, $author, $filename, $filesize);
-		$this->assertTrue(is_null($resu));
-        //var_dump($resu);
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-
-	function testCreateExistingWork() {
-		global $dropbox_cnf;
-		$dropbox_cnf['tbl_file'] 		= Database::get_course_table(TABLE_DROPBOX_FILE);
-		$dropbox_cnf['tbl_feedback'] 	= Database::get_course_table(TABLE_DROPBOX_FEEDBACK);
-		$id = 1;
-		$resu= $this->ddropboxwork->_createExistingWork($id);
-		$this->assertTrue(is_null($resu));
-        //var_dump($resu);
-	}
-
-//Class Dropbox_SentWork
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-
-	function testDropbox_SentWork() {
-		$arg1 = 1;
-		$resu= $this->ddropboxsentwork->Dropbox_SentWork($arg1, $arg2=null, $arg3=null, $arg4=null, $arg5=null, $arg6=null, $arg7=null);
-		$this->assertTrue(is_null($resu));
-	}
-
-	/**
-	 * private function creating a new SentWork object
-	 *
-	 * @param unknown_type $uploader_id
-	 * @param unknown_type $title
-	 * @param unknown_type $description
-	 * @param unknown_type $author
-	 * @param unknown_type $filename
-	 * @param unknown_type $filesize
-	 * @param unknown_type $recipient_ids
-	 */
-
-	function testCreateNewSentWork() {
-		$recipient_ids = array(1,2);
-		$uploader_id=1;
-		$title='test';
-		$description = 'testing';
-		$author= 'test';
-		$filename='test.txt';
-		$filesize=125;
-		$resu= $this->ddropboxsentwork->_createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids);
-		$this->assertTrue(is_null($resu));
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-
-	function testCreateExistingSentWork() {
-		$id = 1;
-		$resu= $this->ddropboxsentwork->_createExistingSentWork($id);
-		$this->assertTrue(is_null($resu));
-	}
-
-//Class Dropbox_SentWork
-
-	/**
-	 * Constructor for recreating the Dropbox_Person object
-	 *
-	 * @param unknown_type $userId
-	 * @param unknown_type $isCourseAdmin
-	 * @param unknown_type $isCourseTutor
-	 * @return Dropbox_Person
-	 */
-
-	function testDropbox_Person() {
-		$userId = 1;
-		$isCourseAdmin = 1;
-		$isCourseTutor = 1;
-		$resu= $this->dperson->Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor);
-		$this->assertTrue(is_null($resu));
-	}
-
-	/**
-	 * method that sorts the objects in the sentWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 *
-	 * @param unknown_type $sort
-	 */
-
-	 function testorderSentWork() {
-		$sort = 1;
-		$resu= $this->dperson->orderSentWork($sort);
-		if(!is_numeric($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 * @param unknown_type $sort
-	 */
-
-	function testorderReceivedWork() {
-		$sort = 1;
-		$resu= $this->dperson->orderReceivedWork($sort);
-		if(!is_numeric($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * Updates feedback for received work of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 * @param unknown_type $text
-	 */
-
-	 function testupdateFeedback() {
-		$id = 1;
-		$text = 'test';
-		$resu= $this->dperson->updateFeedback($id, $text);
-		if(!is_bool($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * Filter the received work
-	 * @param string $type
-	 * @param string $value
-	 */
-
-	 function testfilter_received_work() {
-		$type = 1;
-		$value = 1;
-		$resu= $this->dperson->filter_received_work($type,$value);
-		if(!is_bool($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * Deletes all the received work of this person
-	 *
-	 */
-
-	 function testdeleteAllReceivedWork() {
-		$resu= $this->dperson->deleteAllReceivedWork();
-		if(!is_numeric($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * Deletes all the received categories and work of this person
-	 */
-
-	function testdeleteReceivedWorkFolder() {
-		$id = 1;
-		$resu= $this->dperson->deleteReceivedWorkFolder($id);
-		if(!is_bool($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * Deletes a received dropbox file of this person with id=$id
-	 *
-	 * @param integer $id
-	 */
-
-	 function testdeleteReceivedWork() {
-		$id = 1;
-		$resu= $this->dperson->deleteReceivedWork($id);
-		if(!is_bool($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	 /**
-	 * Deletes all the sent dropbox files of this person
-	 */
-
-	 function testdeleteAllSentWork() {
-		$resu= $this->dperson->deleteAllSentWork();
-		if(!is_bool($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-
-	/**
-	 * Deletes a sent dropbox file of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 */
-
-	function testdeleteSentWork() {
-		$id = 1;
-		$resu= $this->dperson->deleteSentWork($id);
-		if(!is_bool($resu)) {
-		$this->assertTrue(is_null($resu));
-		}
-	}
-}
-?>
diff --git a/tests/main/dropbox/dropbox_functions.inc.test.php b/tests/main/dropbox/dropbox_functions.inc.test.php
deleted file mode 100755
index fc3c4de1e9..0000000000
--- a/tests/main/dropbox/dropbox_functions.inc.test.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-//include_once(api_get_path(LIBRARY_PATH)."/pclzip/pclzip.lib.php");
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
-class TestDropboxFunctions extends UnitTestCase {
-
-	/**
-	* This function is a wrapper function for the multiple actions feature.
-	* @return	Mixed	If there is a problem, return a string message, otherwise nothing
-	*/
-
-	function testhandle_multiple_actions() {
-		global $_user, $is_courseAdmin, $is_courseTutor;
-		$res= handle_multiple_actions();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-
-	/**
-	* Displays the form to move one individual file to a category
-	* @return html code of the form that appears in a dokeos message box.
-	*/
-
-	function testdisplay_move_form() {
-        ob_start();
-        $id = 1;
-        $part = 'test';
-        $res = display_move_form($part, $id, $target = array());
-        ob_end_clean();
-        if (!is_null($res)) {
-            $this->assertTrue(is_string($res));
-        }
-	}
-	/**
-	* This function displays the form to add a new category.
-	*
-	* @param $category_name this parameter is the name of the category (used when no section is selected)
-	* @param $id this is the id of the category we are editing.
-	*
-	* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-	* @version march 2006
-	*/
-
-	function testdisplay_addcategory_form() {
-		global $dropbox_cnf;
-		ob_start();
-		$action= 'test';
-		$res= display_addcategory_form($category_name='', $id='',$action);
-		ob_end_clean();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* this function displays the form to upload a new item to the dropbox.
-	*
-	* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-	* @version march 2006
-	*/
-
-	function testDisplay_add_form() {
-		global $_user, $is_courseAdmin, $is_courseTutor, $course_info, $origin, $dropbox_unid;
-		ob_start();
-		$res= display_add_form();
-		ob_end_clean();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This function displays the firstname and lastname of the user as a link to the user tool.
-	* @see this is the same function as in the new forum, so this probably has to move to a user library.
-	* @todo move this function to the user library
-	*/
-
-	function testdisplayuserlink() {
-		global $_otherusers;
-		$user_id = 1;
-		$res= display_user_link($user_id, $name='');
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @desc This function retrieves the number of feedback messages on every document. This function might become obsolete when
-	* 		the feedback becomes user individual.
-	*/
-
-	function testget_total_number_feedback() {
-		global $dropbox_cnf;
-		$res= get_total_number_feedback($file_id='');
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This function retrieves all the dropbox categories and returns them as an array
-	* @param $filter default '', when we need only the categories of the sent or the received part.
-	* @return array
-	*/
-
-	function testGetdropbox_categories() {
-		$res= get_dropbox_categories($filter='');
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* Mailing zip-file is posted to (dest_user_id = ) mailing pseudo_id
-	* and is only visible to its uploader (user_id).
-	* Mailing content files have uploader_id == mailing pseudo_id, a normal recipient,
-	* and are visible initially to recipient and pseudo_id.
-	* @todo check if this function is still necessary.
-	*/
-
-	function testgetUserOwningThisMailing() {
-		global $dropbox_cnf;
-		$mailingPseudoId = '1';
-		$res= getUserOwningThisMailing($mailingPseudoId, $owner = 0, $or_die = '');
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	 * Get the last access to a given tool of a given user
-	 * @param $tool string the tool constant
-	 * @param $course_code the course_id
-	 * @param $user_id the id of the user
-	 * @return string last tool access date
-	 * @todo consider moving this function to a more appropriate place.
-	 */
-
-	function testget_last_tool_access() {
-		global $_course, $_user;
-		$tool = '1';
-		$res= get_last_tool_access($tool, $course_code='', $user_id='');
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This functions stores a new dropboxcategory
-	* @var 	it might not seem very elegant if you create a category in sent and in received with the same name that you get two entries in the
-	*		dropbox_category table but it is the easiest solution. You get
-	*		cat_name | received | sent | user_id
-	*		test	 |	  1		|	0  |	237
-	*		test	 |	  0		|	1  |	237
-	*		more elegant would be
-	*		test	 |	  1		|	1  |	237
-	*/
-
-	function teststoreaddcategory() {
-		global $_user,$dropbox_cnf;
-		$res= store_addcategory();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This function moves a file to a different category
-	* @param $id the id of the file we are moving
-	* @param $target the id of the folder we are moving to
-	* @param $part are we moving a received file or a sent file?
-	* @return language string
-	*/
-
-	function testStoremove() {
-		$id= 1;
-		$part = 'test';
-		$target = array();
-		$res= store_move($id, $target, $part);
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	*@return selected string
-	*/
-
-	function teststoreadddropbox() {
-		global $dropbox_cnf;
-		global $_user;
-		global $_course;
-		$res= store_add_dropbox();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @return boolean indicating if user with user_id=$user_id is a course member
-	* @todo eliminate global
-	* @todo check if this function is still necessary. There might be a library function for this.
-	*/
-
-	function testIsCourseMember() {
-		$user_id = 1;
-		$res= isCourseMember($user_id);
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* this function transforms the array containing all the feedback into something visually attractive.
-	* @param an array containing all the feedback about the given message.
-	*/
-
-	function testfeedback() {
-		$array = array();
-		$res= feedback($array);
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This function returns the html code to display the feedback messages on a given dropbox file
-	* @param $feedback_array an array that contains all the feedback messages about the given document.
-	* @return html code
-	* @todo add the form for adding new comment (if the other party has not deleted it yet).
-	* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-	* @version march 2006
-	*/
-
-	function testformat_feedback() {
-		$feedback = array();
-		$res= format_feedback($feedback);
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* this function returns the code for the form for adding a new feedback message to a dropbox file.
-	* @return html code
-	*/
-
-	function testfeedback_form() {
-		global $dropbox_cnf;
-		$res= feedback_form();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @return a language string (depending on the success or failure.
-	*/
-
-	function teststore_feedback() {
-		global $dropbox_cnf;
-		global $_user;
-		$res= store_feedback();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @desc This function checks if the real filename of the dropbox files doesn't already exist in the temp folder. If this is the case then
-	*		it will generate a different filename;
-	*/
-
-	function testcheck_file_name() {
-		global $_course;
-		$file_name_2_check = 'test';
-		$res= check_file_name($file_name_2_check, $counter=0);
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @desc this function checks if the key exists. If this is the case it returns the value, if not it returns 0
-	*/
-
-	function testcheck_number_feedback() {
-		$key = 'test';
-		$array = array();
-		$res= check_number_feedback($key, $array);
-		if(!is_null($res)){
-		$this->assertTrue(is_numeric($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @desc generates the contents of a html file that gives an overview of all the files in the zip file.
-	*		This is to know the information of the files that are inside the zip file (who send it, the comment, ...)
-	*/
-
-	function testgenerate_html_overview() {
-		$files = array();
-		$res= generate_html_overview($files, $dont_show_columns=array(), $make_link=array());
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This function downloads all the files of the inputarray into one zip
-	* @param $array an array containing all the ids of the files that have to be downloaded.
-	* @todo consider removing the check if the user has received or sent this file (zip download of a folder already sufficiently checks for this).
-	* @todo integrate some cleanup function that removes zip files that are older than 2 days
-	*/
-	/*
-	function testzip_download() {
-		global $_course;
-		global $dropbox_cnf;
-		global $_user;
-		global $files;
-		$array = array();
-		$res= zip_download($array);
-		if(!is_string($res)){
-		$this->assertTrue(is_null($res));
-		}
-        //var_dump($res);
-	}
-	*/
-
-	/**
-	* This is a callback function to decrypt the files in the zip file to their normal filename (as stored in the database)
-	* @param $p_event a variable of PCLZip
-	* @param $p_header a variable of PCLZip
-	*/
-
-	function testmy_pre_add_callback() {
-		global $files;
-		$p_event = 'test';
-		$res= my_pre_add_callback($p_event, &$p_header);
-		if(!is_null($res)){
-		$this->assertTrue(is_numeric($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @desc Cleans the temp zip files that were created when users download several files or a whole folder at once.
-	*		T
-	* @return true
-	*/
-
-	function testcleanup_temp_dropbox() {
-		global $_course;
-		$res= cleanup_temp_dropbox();
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* This function deletes a dropbox category
-	* @todo give the user the possibility what needs to be done with the files in this category: move them to the root, download them as a zip, delete them
-	*/
-
-	function testdelete_category() {
-		global $_user, $is_courseAdmin, $is_courseTutor,$dropbox_cnf;
-		$id= 1;
-		$action = 'test';
-		$res= delete_category($action, $id);
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-
-		/**
-	* Checks if there are files in the dropbox_file table that aren't used anymore in dropbox_person table.
-	* If there are, all entries concerning the file are deleted from the db + the file is deleted from the server
-	*/
-
-	function testremoveUnusedFiles() {
-		$res= removeUnusedFiles();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-	* @todo check if this function is still necessary.
-	*/
-
-	function testremoveMoreIfMailing() {
-		$file_id = 1;
-		$res= removeMoreIfMailing($file_id);
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/main/exercice/answer.class.test.php b/tests/main/exercice/answer.class.test.php
deleted file mode 100755
index e9939b0b2b..0000000000
--- a/tests/main/exercice/answer.class.test.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-class TestAnswer extends UnitTestCase {
-
-	public $aAnswer;
-	
-	public function TestAnswer() {
-		$this->UnitTestCase('');
-	}
-	
-	public function setUp() {
-		/*
-		//Create a new exercise
-		require_once api_get_path(SYS_CODE_PATH).'exercise/exercise.class.php';
-		require_once api_get_path(SYS_CODE_PATH).'inc/lib/pear/HTML/QuickForm.php';
-		$this->aAnswer = new Answer(2);
-		$this->aAnswer->read();
-		$this->aAnswer = new Exercise();
-		
-		$form = array(
-		'exerciseTitle'=>'testtitle',
-		'exerciseDescription'=>'testdescription',
-		'exerciseAttempts'=>'0',
-		'exerciseFeedbackType'=>'0',
-		'exerciseType'=>'1',
-		'randomQuestions'=>'0',
-		'randomAnswers'=>'0',
-		'results_disabled'=>'0',
-    	'enabletimercontroltotalminutes'=>'0');
-    	$res = Exercise::processCreation($form,$type='1');
-    	*/
-		$this->aAnswer = new Answer(2);
-					
-		
-	}
-	
-	public function tearDown() {		
-		$this->aAnswer = null;
-	}
-	
-	/**
-	 * constructor of the class
-	 *
-	 * @author 	Olivier Brouckaert
-	 * @param 	integer	Question ID that answers belong to
-	 */
-	 
-	 /*
-	function testAnswerConstructor() {
-		$questionId = 1;
-		$res = $this->aAnswer->Answer($questionId);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}  
-	*/
-	
-	 
-	
-	/**
-	 * creates a new answer
-	 *
-	 * @author Olivier Brouckaert
-	 * @param string 	answer title
-	 * @param integer 	0 if bad answer, not 0 if good answer
-	 * @param string 	answer comment
-	 * @param integer 	answer weighting
-	 * @param integer 	answer position
-	 * @param coordinates 	Coordinates for hotspot exercises (optional)
-	 * @param integer		Type for hotspot exercises (optional)
-	 */
-	 
-	 function testcreateAnswer() {
-	 	$answer = 'test';
-	 	$correct = 1;
-	 	$comment ='test';
-	 	$weighting = 2;
-	 	$position = 1;
-		$res = $this->aAnswer->createAnswer($answer,$correct,$comment,$weighting,$position,$new_hotspot_coordinates = 1, $new_hotspot_type = 1,$destination='');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	} 
-	
-	/**
-	 * duplicates answers by copying them into another question
-	 * @param - integer $newQuestionId - ID of the new question
-	 */
-	 
-	 function testduplicate() {
-	 	$newQuestionId = 1;
-		$res = $this->aAnswer->duplicate($newQuestionId);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	} 
-	
-	/**
-	 * Returns a list of answers
-	 * @return array	List of answers where each answer is an array of (id, answer, comment, grade) and grade=weighting
-	 */
-	 
-	 function testgetAnswersList() {
-		$res = $this->aAnswer->getAnswersList();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	} 
-	 
-	/**
-	 * Returns a list of grades
-	 * @return array	List of grades where grade=weighting (?)
-	 */
-	 
-	 function testgetGradesList() {
-		$res = $this->aAnswer->getGradesList();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	} 
-	
-	/**
-	  * Returns the question type
-	  * @return	integer	The type of the question this answer is bound to
-	  */
-	  
-	  function testgetQuestionType() {
-		$res = $this->aAnswer->getQuestionType();
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * tells if answer is correct or not
-	 * @param - integer $id - answer ID
-	 * @return - integer - 0 if bad answer, not 0 if good answer
-	 */
-	 
-	 function testisCorrect() {
-	 	$id = 1;
-		$res = $this->aAnswer->isCorrect($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * reads answer informations from the data base
-	 */
-	 
-	 function testread() {
-		$res = $this->aAnswer->read();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * reads answer informations from the data base ordered by parameter
-	 * @param	string	Field we want to order by
-	 * @param	string	DESC or ASC
-	 */
-	 
-	 function testreadOrderedBy() {
-	 	global $_course;
-	 	$field = 'position';
-		$res = $this->aAnswer->readOrderedBy($field,$order=ASC);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * records answers into the data base
-	 */
-	 
-	 function testsave() {
-		$res = $this->aAnswer->save();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the answer title
-	 * @param - integer $id - answer ID
-	 * @return - string - answer title
-	 */
-	 
-	 function testselectAnswer() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectAnswer($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * @param - integer $id - answer ID
-	 * @return - bool - answer by id
-	 */
-	function testselectAnswerByAutoId() {
-	 	$auto_id = 1;
-		$res = $this->aAnswer->selectAnswerByAutoId($auto_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the answer title from an answer's position
-	 * @param - integer $id - answer ID
-	 * @return - bool - answer title
-	 */
-	 
-	 function testselectAnswerIdByPosition() {
-	 	$pos = 1;
-		$res = $this->aAnswer->selectAnswerIdByPosition($pos);
-		if(!is_null($res)){
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the autoincrement id identificator
-	 * @return - integer - answer num
-	 */
-	 
-	 function testselectAutoId() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectAutoId($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns answer comment
-	 * @param - integer $id - answer ID
-	 * @return - string - answer comment
-	 */
-	 
-	 function testselectComment() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectComment($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		}
-		//var_dump($res);
-	}	
-	
-	/**
-	 * returns the question ID of the destination question
-	 * @return - integer - the question ID
-	 */
-	 
-	 function testselectDestination() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectDestination($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		}
-		//var_dump($res);
-	}	
-	
-	/**
-	 * returns answer hotspot coordinates
-	 * @param	integer	Answer ID
-	 * @return	integer	Answer position
-	 */
-	 
-	 function testselectHotspotCoordinates() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectHotspotCoordinates($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		}
-	}
-	
-	/**
-	 * returns answer hotspot type
-	 *
-	 * @author	Toon Keppens
-	 * @param	integer		Answer ID
-	 * @return	integer		Answer position
-	 */
-	
-	function testselectHotspotType() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectHotspotType($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		}
-	}
-	
-	/**
-	 * returns the number of answers in this question
-	 *
-	 * @author - Olivier Brouckaert
-	 * @return - integer - number of answers
-	 */
-	 
-	 function testselectNbrAnswers() {
-		$res = $this->aAnswer->selectNbrAnswers();
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-	}
-	 
-	/**
-	 * returns answer position
-	 *
-	 * @author - Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return - integer - answer position
-	 */
-	 
-	 function testselectPosition() {
-	 	$id = 1;
-		$res = $this->aAnswer->selectPosition($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-	}
-	
-	/**
-	 * returns the question ID which the answers belong to
-	 *
-	 * @author - Olivier Brouckaert
-	 * @return - integer - the question ID
-	 */
-	 
-	 function testselectQuestionId() {
-		$res = $this->aAnswer->selectQuestionId();
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-	}
-	
-	/**
-	 * returns answer weighting
-	 *
-	 * @author - Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return - integer - answer weighting
-	 */
-	
-	function testselectWeighting() {
-		$id = 1;
-		$res = $this->aAnswer->selectWeighting($id);
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-	}
-	
-	 /**
-	 * updates an answer
-	 *
-	 * @author Toon Keppens
-	 * @param	string	Answer title
-	 * @param	string	Answer comment
-	 * @param	integer	Answer weighting
-	 * @param	integer	Answer position
-	 */
-	 
-	 function testupdateAnswers() {
-		$answer = '';
-		$comment = '';
-		$weighting=2;
-		$position=1;
-		$destination='0@@0@@0@@0';
-		$res = $this->aAnswer->updateAnswers($answer,$comment,$weighting,$position,$destination);
-		if(!is_null($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-	}
-	
-	/**
-	 *  clears $new_* arrays
-	 */
-	 
-	 function testcancel() {
-		$res = $this->aAnswer->cancel();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	} 
-}
-?>
diff --git a/tests/main/exercice/exercise.class.test.php b/tests/main/exercice/exercise.class.test.php
deleted file mode 100755
index 83490531b3..0000000000
--- a/tests/main/exercice/exercise.class.test.php
+++ /dev/null
@@ -1,539 +0,0 @@
-<?php
-
-class TestExercise extends UnitTestCase {
-	
-	public $eExercise;
-	
-	public function TestExercise() {
-		$this->UnitTestCase('');
-	}
-	
-	public function setUp() {
-
-		$this->eExercise = new Exercise();			
-	}
-	
-	public function tearDown() {		
-		$this->eExercise = null;
-	}
-	
-	/**
-	 * adds a question into the question list
-	 * @param - integer $questionId - question ID
-	 * @return - boolean - true if the question has been added, otherwise false
-	 */
-		
-	function testaddToList() {
-		$questionId = 1;
-		$res = $this->eExercise->addToList($questionId);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * Creates the form to create / edit an exercise
-	 * @param FormValidator $form the formvalidator instance (by reference)
-	 */
-	 
-	function testcreateForm() {
-		global $id;
-		$form = new FormValidator('introduction_text');
-		$res = $this->eExercise->createForm($form, $type='full');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}	
-	
-	
-	/**
-	 * disables the exercise
-	 */
-	 
-	 function testdisable() {
-		$res = $this->eExercise->disable();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}	
-	
-	 function testdisable_results() {
-		$res = $this->eExercise->disable_results();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * enables the exercise
-	 */	
-	 
-	 function testenable() {
-		$res = $this->eExercise->enable();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	function testenable_results() {
-		$res = $this->eExercise->enable_results();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * Same as isRandom() but has a name applied to values different than 0 or 1
-	 */
-	 
-	 function testgetShuffle() {
-		$res = $this->eExercise->getShuffle();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	 
-	 /**
-	 * returns 'true' if the question ID is in the question list
-	 *
-	 * @author - Olivier Brouckaert
-	 * @param - integer $questionId - question ID
-	 * @return - boolean - true if in the list, otherwise false
-	 */
-	
-	function testisInList() {
-		$questionId = 1;
-		$res = $this->eExercise->isInList($questionId);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * tells if questions are selected randomly, and if so returns the draws
-	 *
-	 * @author - Olivier Brouckaert
-	 * @return - integer - 0 if not random, otherwise the draws
-	 */
-	
-	function testisRandom() {
-		$res = $this->eExercise->isRandom();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * moves a question down in the list
-	 * @param - integer $id - question ID to move down
-	 */
-	
-	function testmoveDown() {
-		$id=1;
-		$res = $this->eExercise->moveDown($id);
-		if(!is_null($res)){
-		$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * moves a question up in the list
-	 * @param - integer $id - question ID to move up
-	 */
-	
-	function testmoveUp() {
-		$id=1;
-		$res = $this->eExercise->moveUp($id);
-		if(!is_null($res)){
-		$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * function which process the creation of exercises
-	 * @param FormValidator $form the formvalidator instance
-	 */
-	 /*
-	 function testprocessCreation() {
-		$form = new FormValidator('exerciseTitle');
-		$res = $this->eExercise->processCreation($form,$type='');
-		if(!is_null($res)){
-		$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}*/
-	
-	/**
-	 * reads exercise informations from the data base
-	 * @param - integer $id - exercise ID
-	 * @return - boolean - true if exercise exists, otherwise false
-	 */
-	
-	function testread() {
-		global $_course;
-       	global $_configuration;
-        global $questionList;
-        $id=1;
-		$res = $this->eExercise->read($id);
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-	
-	/**
-	 * removes a question from the question list
-	 * @param - integer $questionId - question ID
-	 * @return - boolean - true if the question has been removed, otherwise false
-	 */
-	 
-	 function testremoveFromList() {
-		global $_course;
-       	global $_configuration;
-        global $questionList;
-        $questionId=1;
-		$res = $this->eExercise-> removeFromList($questionId);
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-	 
-	 /**
-	 * updates the exercise in the data base
-	 */
-	 
-	 function testsave() {
-		global $_course,$_user;
-		$res = $this->eExercise-> save($type_e='');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	 function testsearch_engine_delete() {
-		$res = $this->eExercise-> search_engine_delete();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	function testsearch_engine_save() {
-		$res = $this->eExercise-> search_engine_save();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the number of attempts setted
-	 * @return - numeric - exercise attempts
-	 */
-	 
-	 function testselectAttempts() {
-		$res = $this->eExercise-> selectAttempts();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the exercise description
-	 * @return - string - exercise description
-	 */
-	 
-	 function testselectDescription() {
-		$res = $this->eExercise-> selectDescription();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the expired time
-	 * @return - string - expired time
-	 */
-	 
-	function testselectExpiredTime() {
-		$res = $this->eExercise-> selectExpiredTime();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-	 
-	/** returns the number of FeedbackType  *
-	 *  0=>Feedback , 1=>DirectFeedback, 2=>NoFeedback
-	 * @return - numeric - exercise attempts
-	 */ 
-	
-	function testselectFeedbackType() {
-		$res = $this->eExercise-> selectFeedbackType();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the exercise ID
-	 * @return - integer - exercise ID
-	 */
-	 
-	 function testselectId() {
-		$res = $this->eExercise-> selectId();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the number of questions in this exercise
-	 * @return - integer - number of questions
-	 */
-	 
-	 function testselectNbrQuestions() {
-		$res = $this->eExercise-> selectNbrQuestions();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	 
-	/**
-	 * returns the array with the question ID list
-	 * @return - array - question ID list
-	 */
-	 
-	 function testselectQuestionList() {
-		$res = $this->eExercise-> selectQuestionList();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-	  
-	/**
-	 * returns random answers status.
-	 */ 
-	 
-	function testselectRandomAnswers() {
-		$res = $this->eExercise-> selectRandomAnswers();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	
-	/**
-     * selects questions randomly in the question list
-	 *
-	 * @author - Olivier Brouckaert
-	 * @return - array - if the exercise is not set to take questions randomly, returns the question list
-	 *					 without randomizing, otherwise, returns the list with questions selected randomly
-     */
-     
-     function testselectRandomList() {
-		$res = $this->eExercise-> selectRandomList();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * tells if questions are selected randomly, and if so returns the draws
-	 * @return - integer - results disabled exercise
-	 */
-	 
-	 function testselectResultsDisabled() {
-		$res = $this->eExercise-> selectResultsDisabled();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the exercise sound file
-	 * @return - string - exercise description
-	 */
-	 
-	 function testselectSound() {
-		$res = $this->eExercise-> selectSound();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the exercise status (1 = enabled ; 0 = disabled)
-	 * @return - int - true if enabled, otherwise false
-	 */
-	 
-	 function testselectStatus() {
-		$res = $this->eExercise-> selectStatus();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the time limit
-	 * @return int
-	 */
-	 
-	 function testselectTimeLimit() {
-		$res = $this->eExercise-> selectTimeLimit();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the exercise title
-	 * @return - string - exercise title
-	 */
-	 
-	 function testselectTitle() {
-		$res = $this->eExercise-> selectTitle();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * returns the exercise type
-	 * @return - integer - exercise type
-	 */
-	 
-	 function testselectType() {
-		$res = $this->eExercise-> selectType();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * sets to 0 if questions are not selected randomly
-	 * if questions are selected randomly, sets the draws
-	 * @param - integer $random - 0 if not random, otherwise the draws
-	 * @return void
-	 */
-	 
-	 function testsetRandom() {
-	 	$random = 1;
-		$res = $this->eExercise-> setRandom($random);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	 
-	/**
-	 * update the table question
-	 * @return void
-	 */
-	function testupdate_question_positions() {
-		$res = $this->eExercise-> update_question_positions();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * changes the exercise max attempts
-	 * @param - numeric $attempts - exercise max attempts
-	 * @return void
-	 */
-	 
-	function testupdateAttempts() {
-		$attempts = 1;
-		$res = $this->eExercise-> updateAttempts($attempts);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * changes the exercise description
-	 * @param - string $description - exercise description
-	 * @return void
-	 */
-	 
-	 function testupdateDescription() {
-		$description = 'testdescription';
-		$res = $this->eExercise-> updateDescription($description);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	* changes the exercise expired_time
-	* @param - int The expired time of the quiz
-	* @return void
-	*/
-	
-	function testupdateExpiredTime() {
-		$expired_time = 1;
-		$res = $this->eExercise-> updateExpiredTime($expired_time);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * changes the exercise feedback type
-	 * @param - numeric $attempts - exercise max attempts
-	 * @return void
-	 */
-	 
-	function testupdateFeedbackType() {
-		$feedback_type = 1;
-		$res = $this->eExercise-> updateFeedbackType($feedback_type);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * sets to 0 if answers are not selected randomly
-	 * if answers are selected randomly
-	 * @param - integer $random_answers - random answers
-	 * @return void
-	 */
-	
-	function testupdateRandomAnswers() {
-		$random_answers = 0;
-		$res = $this->eExercise-> updateRandomAnswers($random_answers);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * update the results
-	 * @return void
-	 */
-	function testupdateResultsDisabled() {
-		$results_disabled = 1;
-		$res = $this->eExercise->updateResultsDisabled($results_disabled);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * changes the exercise sound file
-	 * @param - string $sound - exercise sound file
-	 * @param - string $delete - ask to delete the file
-	 * @return void
-	 */
-	
-	function testupdateSound() {
-		global $audioPath, $documentPath,$_course, $_user;
-		$sound = 'test';
-		$delete = 'test';
-		$res = $this->eExercise->updateSound($sound,$delete);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * changes the exercise title
-	 * @param - string $title - exercise title
-	 * @return void
-	 */
-	 
-	function testupdateTitle() {
-		$title = 'test';
-		$res = $this->eExercise->updateTitle($title);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * changes the exercise type
-	 * @param - integer $type - exercise type
-	 */
-	 
-	 function testupdateType() {
-		$type = 1;
-		$res = $this->eExercise->updateType($type);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * deletes the exercise from the database
-	 * Notice : leaves the question in the data base
-	 */
-	 
-	 function testdelete() {
-	 	global $_course,$_user;
-		$res = $this->eExercise->delete();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}	
-}
-?>
diff --git a/tests/main/exercice/exercise.lib.test.php b/tests/main/exercice/exercise.lib.test.php
deleted file mode 100755
index 70658cb426..0000000000
--- a/tests/main/exercice/exercise.lib.test.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH).'exercise/question.class.php';
-
-class TestExerciseLib extends UnitTestCase {
-	/*public $eQuestion;
-
-	public function TestExerciseLib() {
-		$this->UnitTestCase('');
-	}
-
-	public function setUp() {
-
-		$this->eQuestion = new Question();
-	}
-
-	public function tearDown() {
-		$this->eQuestion = null;
-	}*/
-	/**
-	 * @param int question id
-	 * @param boolean only answers
-	 * @param boolean origin i.e = learnpath
-	 * @param int current item from the list of questions
-	 * @param int number of total questions
-	 */
-
- 	 function testshowQuestion() {
- 	 	global $_course;
- 	 	$questionId = 1;
- 	 	$current_item = 1 ;
- 	 	$total_item = 1;
- 	 	//$objQuestionTmp = $question->read($questionId);
- 	 	$res = ExerciseLib::showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_item, $total_item);
- 	 	$this->assertTrue(is_null($res));
- 	 	var_dump($res);
- 	 }
-
-
-
-
-}
-?>
diff --git a/tests/main/exercice/exercise_result.class.test.php b/tests/main/exercice/exercise_result.class.test.php
deleted file mode 100755
index 7ec2587c82..0000000000
--- a/tests/main/exercice/exercise_result.class.test.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-class TestExerciseResult extends UnitTestCase
-{
-	public $eExerciseResult;
-
-	public function TestExerciseResult() {
-		$this->UnitTestCase('');
-	}
-
-	public function setUp() {
-		$this->eExerciseResult = new ExerciseResult();
-	}
-
-	public function tearDown() {
-		$this->eExerciseResult = null;
-	}
-
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 */
-
-	function test_getExercisesReporting() {
-		global $user_id;
-	 	$document_path = api_get_path(SYS_COURSE_PATH).'document/';
-		$res = $this->eExerciseResult->_getExercisesReporting($document_path,$user_id,$filter=0);
-		if(!is_null($res)) {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-
-	 function testexportCompleteReportCSV() {
-		global $user_id;
-		$document_path = api_get_path(SYS_COURSE_PATH).'document/';
-		if(!headers_sent()){
-		$res = $this->eExerciseResult->exportCompleteReportCSV($document_path,$user_id, $export_user_fields = array(), $export_filter = 0);
-		}
-		if(!is_null($res)) {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
-
-	 function testexportCompleteReportXLS() {
-		global $user_id;
-		$document_path = api_get_path(SYS_COURSE_PATH).'document/';
-		if(!headers_sent()){
-		$res = $this->eExerciseResult->exportCompleteReportXLS($document_path='',$user_id, $export_user_fields=array(), $export_filter = 0);
-		}
-		if(!is_null($res)) {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-
-
-
-
-
-
-
-
-
-
-
-}
-?>
diff --git a/tests/main/exercice/export/exercise_import.inc.test.php b/tests/main/exercice/export/exercise_import.inc.test.php
deleted file mode 100755
index 2f2c1b13a7..0000000000
--- a/tests/main/exercice/export/exercise_import.inc.test.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-
-//Is possible than this functions still are not implemented int he Chamilo systems or some are deprecated
-
-
-class TestExerciseImport extends UnitTestCase {
-	
-	function testelementData() {
-		global $element_pile;
-		$element_pile = array();
-		$parser= array();
-		$data = array();
-		$res = elementData($parser,$data);
-		$this->assertFalse(is_array($res));
-		if(!is_null){
-			$this->assertTrue($res);
-		}
-		//var_dump($res);
-	} 
-	
-	function testendElement() {
-		global $element_pile;
-		$element_pile = array();
-		$parser= array();
-		$data = array();
-		$res = endElement($parser,$data);
-		$this->assertFalse(is_array($res));
-		if(!is_null){
-			$this->assertTrue($res);
-		}
-		//var_dump($res);
-	} 
-	
-	/**
-	 * possible deprecated
-	 * @return the path of the temporary directory where the exercise was uploaded and unzipped
-	 */
- 
-	/*function testgetandunzipuploadedexercise() {
-		include_once (realpath(dirname(__FILE__) . '/../../inc/lib/pclzip/') . '/pclzip.lib.php');
-		$res = get_and_unzip_uploaded_exercise();
-		$this->assertFalse(is_array($res));
-		if(!is_null){
-			$this->assertTrue($res);
-		}
-		//var_dump($res);
-	} */
-	
-	/**
-	 * main function to import an exercise,
-	 * Possible deprecated
-	 * @return an array as a backlog of what was really imported, and error or debug messages to display
-	 */
- 
-	/*function testimport_exercise() {
-		$file = '';
-		$res = import_exercise($file);
-		$this->assertFalse(is_array($res));
-		if(!is_null){
-			$this->assertTrue($res);
-		}
-		var_dump($res);
-	}*/
-	
-	function testparse_file() {
-		$file = '';
-		$exercisePath = '';
-		$questionFile = '';
-		$res = qti_parse_file($exercisePath, $file, $questionFile);
-		$this->assertTrue(is_array($res));
-		if(!is_null){
-			$this->assertTrue($res);
-		}
-		//var_dump($res);
-	}
-	
-	function teststartElement() {
-		$parser = 'test';
-		$name = 'test';
-		$attributes = array();
-		$res = startElement($parser, $name, $attributes);
-		$this->assertFalse(is_array($res));
-		if(!is_null){
-			$this->assertTrue($res);
-		}
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/exercice/export/qti2/qti2_classes.test.php b/tests/main/exercice/export/qti2/qti2_classes.test.php
deleted file mode 100755
index b264395b28..0000000000
--- a/tests/main/exercice/export/qti2/qti2_classes.test.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/answer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/question.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/exercise.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/hotspot.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/unique_answer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/multiple_answer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/matching.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/freeanswer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'/exercise/fill_blanks.class.php');
-
-class TestQti2 extends UnitTestCase {
-
-	public $qIms2Question;
-	public $qImsAnswerFillInBlanks;
-	public $qImsAnswerFree;
-	public $qImsAnswerHotspot;
-	public $qImsAnswerMatching;
-	public $qImsAnswerMultipleChoice;
-
-	public function __construct() {
-        $this->UnitTestCase('QTI2 library - main/exercise/export/qti2/qti2_classes.test.php');
-	}
-
-	public function setUp() {
-		$this->qIms2Question = new Ims2Question();
-		$this->qImsAnswerFillInBlanks = new ImsAnswerFillInBlanks(1);
-		$this->qImsAnswerFree = new ImsAnswerFree(1);
-		$this->qImsAnswerHotspot = new ImsAnswerHotspot(1);
-		$this->qImsAnswerMatching = new ImsAnswerMatching(1);
-		$this->qImsAnswerMultipleChoice = new ImsAnswerMultipleChoice(1);
-	}
-
-	public function tearDown() {
-		$this-> qIms2Question = null;
-		$this-> qImsAnswerFillInBlanks = null;
-		$this-> qImsAnswerFree = null;
-		$this-> qImsAnswerHotspot = null;
-		$this-> qImsAnswerMatching = null;
-		$this-> qImsAnswerMultipleChoice = null;
-	}
-
-//Class qIms2Question
-	 /**
-     * Include the correct answer class and create answer
-     */
-
-	function testsetAnswer() {
-		$res=Ims2Question::setAnswer();
-		if(!is_null){
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-
-	function testcreateAnswersForm() {
-		$form = array(1);
-		$res=Ims2Question::createAnswersForm($form);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testprocessAnswersCreation() {
-		$form = array(1);
-		$res=Ims2Question::processAnswersCreation($form);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-
-//Class qImsAnswerFillInBlanks
-
- 	 /**
-     * Export the text with missing words.
-     *
-     *
-     */
-	function testimsExportResponses() {
-		$questionIdent = array(1);
-		$questionStatment = array(1);
-		$res=$this->qImsAnswerFillInBlanks->imsExportResponses($questionIdent, $questionStatment);
-			if(!is_null){
-				$this->assertTrue(is_bool($res));
-			}
-		//var_dump($res);
-	}
-
-	function testimsExportResponsesDeclaration() {
-		$questionIdent = array(1);
-		$res=$this->qImsAnswerFillInBlanks->imsExportResponsesDeclaration($questionIdent);
-			if(!is_null){
-				$this->assertTrue(is_bool($res));
-			}
-		//var_dump($res);
-	}
-
-//Class qImsAnswerFree
-
-	/**
-     * TODO implement
-     * Export the question part as a matrix-choice, with only one possible answer per line.
-     */
-
-	function testImsExportResponsesqImsAnswerFree() {
-		$questionIdent = array('');
-		$questionStatment = array('');
-		$res=$this->qImsAnswerFree->imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testImsExportResponsesDeclarationqImsAnswerFree() {
-		$questionIdent = array(1);
-		$res=$this->qImsAnswerFree->imsExportResponsesDeclaration($questionIdent);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-
-//Class qImsAnswerHotspot
-
-	/**
-     * TODO update this to match hotspots instead of copying matching
-     * Export the question part as a matrix-choice, with only one possible answer per line.
-     */
-
-	function testimsExportResponsesqImsAnswerHotspot() {
-		$questionIdent = array(1);
-		$questionStatment = array(1);
-		$res=$this->qImsAnswerHotspot->imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-
-	function testimsExportResponsesDeclarationqImsAnswerHotspot() {
-		$questionIdent = array(1);
-		$res=$this->qImsAnswerHotspot->imsExportResponsesDeclaration($questionIdent);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-//Class qImsAnswerMatching
-
-    /**
-     * Export the question part as a matrix-choice, with only one possible answer per line.
-     */
-
-	function testimsExportResponsesqImsAnswerMatching() {
-		$questionIdent = array(1);
-		$questionStatment = array(1);
-		$res=$this->qImsAnswerMatching->imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-
-	function testimsExportResponsesDeclarationqImsAnswerMatching() {
-		$questionIdent = array(1);
-		$res=$this->qImsAnswerMatching->imsExportResponsesDeclaration($questionIdent);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-//Class qImsAnswerMultipleChoice
-
-     /**
-     * Return the XML flow for the possible answers.
-     *
-     */
-
-	function testimsExportResponsesqImsAnswerMultipleChoice() {
-		$questionIdent = array(1);
-		$questionStatment = array(1);
-		$res=$this->qImsAnswerMultipleChoice->imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-
-	function testimsExportResponsesDeclarationqImsAnswerMultipleChoice() {
-		$questionIdent = array(1);
-		$res=$this->qImsAnswerMultipleChoice->imsExportResponsesDeclaration($questionIdent);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/exercice/export/qti2/qti2_export.test.php b/tests/main/exercice/export/qti2/qti2_export.test.php
deleted file mode 100755
index 9592ed8df9..0000000000
--- a/tests/main/exercice/export/qti2/qti2_export.test.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-//Is possible than this functions are not implemented or some are deprecated, this file will not
-//available for the test suite.
-
-class TestQti2Export extends UnitTestCase {
-	
-	public $qImsAssessmentItem;
-	public $qImsItem;
-	public $qImsSection;
-	
-	
-	public function TestQti2Export() {
-		$this->UnitTestCase('');
-	}
-	
-	public function setUp() {	
-
-		//$objQuestion = Question::read(1);		
-		$objQuestion = Question::read(1);
-		
-		$question = new Ims2Question();
-	    /*
-	    $qst = $question->read(1);
-	    if( !$qst or $qst->type == FREE_ANSWER)
-	    {
-	        return '';
-	    }
-	    $question->id = $qst->id;
-	    $question->type = $qst->type;
-	    $question->question = $qst->question;
-	    $question->description = $qst->description;
-		$question->weighting=$qst->weighting;
-		$question->position=$qst->position;
-		$question->picture=$qst->picture;
-		*/
-						
-		$this->qImsAssessmentItem = new ImsAssessmentItem($question);		
-		//$this->qImsItem = new ImsItem(1);
-		//$this->qImsSection = new ImsSection(1);
-	}
-	
-	public function tearDown() {		
-		$this-> qImsAssessmentItem = null;
-		$this-> qImsItem = null;
-		$this-> qImsSection = null;
-	}
-	
-//Class ImsAssessmentItem
-	
-	 /**
-     * Constructor.
-     * @param $question The Question object we want to export.
-     */
-     /*
-	function testImsAssessmentItem() {
-		$question = array();
-		$res = $this->qImsAssessmentItem->ImsAssessmentItem($question);
-			if(!is_null){
-			$this->assertTrue(is_bool($res));
-			}
-			var_dump($res);
-	}  
-	*/
-	
-	function teststart_item() {
-		/*
-		$res = $this->qImsAssessmentItem->start_item();
-		if(!is_null){
-			$this->assertTrue(is_bool($res));
-		}
-		var_dump($res);
-		*/
-	} 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-}
-?>
diff --git a/tests/main/exercice/export/scorm/scorm_classes.test.php b/tests/main/exercice/export/scorm/scorm_classes.test.php
deleted file mode 100755
index eae2ed516c..0000000000
--- a/tests/main/exercice/export/scorm/scorm_classes.test.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-require_once(api_get_path(SYS_CODE_PATH).'exercise/question.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/exercise.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/unique_answer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/multiple_answer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/multiple_answer_combination.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/fill_blanks.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/freeanswer.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/hotspot.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/matching.class.php');
-require_once(api_get_path(SYS_CODE_PATH).'exercise/hotspot.class.php');
-
-class TestScormClasses extends UnitTestCase {
-
-	public $sScormAnswerFillInBlanks;
-	public $sScormAnswerFree;
-	public $sScormAnswerHotspot;
-	public $sScormAnswerMatching;
-	public $sScormAnswerMultipleChoice;
-	public $sScormAnswerTrueFalse;
-	public $sScormQuestion;
-
-	public function __construct() {
-	   $this->UnitTestCase('SCORM exercises export library - main/exercise/export/scorm/scorm_classes.test.php');
-	}
-
-	public function setUp() {
-		$this->sScormAnswerFillInBlanks = new ScormAnswerFillInBlanks(1);
-		$this->sScormAnswerFree = new ScormAnswerFree(1);
-		$this->sScormAnswerHotspot = new ScormAnswerHotspot(1);
-		$this->sScormAnswerMatching = new ScormAnswerMatching(1);
-		$this->sScormAnswerMultipleChoice = new ScormAnswerMultipleChoice(1);
-		$this->sScormAnswerTrueFalse = new ScormAnswerTrueFalse(1);
-		$this->sScormQuestion = new ScormQuestion(1);
-	}
-
-	public function tearDown() {
-		$this-> sScormAnswerFillInBlanks = null;
-		$this-> sScormAnswerFree = null;
-		$this-> sScormAnswerHotspot = null;
-		$this-> sScormAnswerMatching = null;
-		$this-> sScormAnswerMultipleChoice = null;
-		$this-> sScormAnswerTrueFalse = null;
-		$this-> sScormQuestion = null;
-	}
-
-
-//Class sScormAnswerFillInBlanks
-
-	/**
-     * Export the text with missing words.
-     *
-     * As a side effect, it stores two lists in the class :
-     * the missing words and their respective weightings.
-     */
-
-	function testexport() {
-		$res= $this->sScormAnswerFillInBlanks->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-//Class sScormAnswerFree
-
-	/**
-     * Export the text with missing words.
-     *
-     * As a side effect, it stores two lists in the class :
-     * the missing words and their respective weightings.
-     *
-     */
-	function testexportsScormAnswerFree() {
-		$res= $this->sScormAnswerFree->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-//Class sScormAnswerHotspot
-
-	/**
-	 * Returns the javascript code that goes with HotSpot exercises
-	 * @return string	The JavaScript code
-	 */
-
-	function testexportsScormAnswerHotspot() {
-		$res= $this->sScormAnswerHotspot->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-		function testgetjsheadersScormAnswerHotspot() {
-		$res= $this->sScormAnswerHotspot->get_js_header();
-		if(!is_null($res)){
-		$this->assertTrue(is_string($res));
-		}
-        //var_dump($res);
-	}
-
-	//Class sScormAnswerMatching
-
-	/**
-     * Export the question part as a matrix-choice, with only one possible answer per line.
-     * @author Amand Tihon <amand@alrj.org>
-     */
-
-	function testexportsScormAnswerMatching() {
-		$res= $this->sScormAnswerMatching->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-//Class sScormAnswerMultipleChoice
-
-	/**
-	 * Return HTML code for possible answers
-     */
-
-	function testexportsScormAnswerMultipleChoice() {
-		$res= $this->sScormAnswerMultipleChoice->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-//Class sScormAnswerTrueFalse
-
-	/**
-     * Return the XML flow for the possible answers.
-     * That's one <response_lid>, containing several <flow_label>
-     */
-
-	function testexportsScormAnswerTrueFalse() {
-		$res= $this->sScormAnswerTrueFalse->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}
-
-//Class sScormQuestion
-
-	function testcreateAnswersFormsScormQuestion() {
-		$form = '';
-		$res= $this->sScormQuestion->createAnswersForm($form);
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-        //var_dump($res);
-	}
-
-	/**
-     * Return the XML flow for the possible answers.
-     * That's one <response_lid>, containing several <flow_label>
-     */
-
-	/*function testexportsScormQuestion() {
-		$res= $this->sScormQuestion->export();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}*/
-
- 	/**
-     * Returns an HTML-formatted question
-     */
-     /*
-	function testgetQuestionHTMLsScormQuestion() {
-		$res= $this->sScormQuestion->getQuestionHTML();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}*/
-
-	/**
-     * Return the JavaScript code bound to the question
-     */
-     /*
-     function testgetQuestionJSsScormQuestion() {
-		$res= ScormQuestion::getQuestionJS();
-		if(!is_null($res)){
-		$this->assertTrue(is_array($res));
-		}
-        //var_dump($res);
-	}*/
-
-	function testprocessAnswersCreationJSsScormQuestion() {
-		$form = '';
-		$res= $this->sScormQuestion->processAnswersCreation($form);
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-        //var_dump($res);
-	}
-
-	 /**
-	 * Include the correct answer class and create answer
-	 */
-
-	 function testsetAnswersCreationJSsScormQuestion() {
-		$res= $this->sScormQuestion->setAnswer();
-		if(!is_null($res)){
-		$this->assertTrue(is_bool($res));
-		}
-        //var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/exercice/fill_blanks.class.test.php b/tests/main/exercice/fill_blanks.class.test.php
deleted file mode 100755
index 055e1072e5..0000000000
--- a/tests/main/exercice/fill_blanks.class.test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-class TestFillBlanksClass extends UnitTestCase {
-	
-	public $fFillBlanks;
-	
-	public function TestFillBlanksClass() {
-		$this->UnitTestCase('');
-	}
-	
-	public function setUp() {
-		$this->fFillBlanks = new FillBlanks();			
-	}
-	
-	public function tearDown() {		
-		$this->fFillBlanks = null;
-	}
-		
-	/**
-	 * function which redifines Question::createAnswersForm
-	 * @param the formvalidator instance
-	 */
-	 /*
-	function testcreateAnswersForm() {
-		$form = new FormValidator('introduction_text');
-		$res = $this->fFillBlanks->createAnswersForm($form);
-		$this->assertTrue(is_null($res));
-		var_dump($res);
-	}*/
-	
-	/**
-	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 */
-	/* 
-	function testprocessAnswersCreation() {
-		global $charset;
-		$form = new FormValidator('introduction_text');
-		$res = $this->fFillBlanks->processAnswersCreation($form);
-		$this->assertTrue(is_null($res));
-		var_dump($res);
-	}*/
-
-}
-?>
diff --git a/tests/main/exercice/freeanswer.class.test.php b/tests/main/exercice/freeanswer.class.test.php
deleted file mode 100755
index 6b1deb894a..0000000000
--- a/tests/main/exercice/freeanswer.class.test.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-class TestFreeanswer extends UnitTestCase {
-
-	/**
-	 * function which redifines Question::createAnswersForm
-	 * @param the formvalidator instance
-	 */
-
-	function testcreateAnswersForm () {
-		$form = new FormValidator('exercise_admin', 'post', api_get_self().'?exerciseId='.intval($_GET['exerciseId']));
-		$res =FreeAnswer::createAnswersForm($form);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 */
-
-	function testprocessAnswersCreation () {
-		$form = new FormValidator('exercise_admin', 'post', api_get_self().'?exerciseId='.intval($_GET['exerciseId']));
-		$res =FreeAnswer::processAnswersCreation($form);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-}
-?>
diff --git a/tests/main/exercice/hotpotatoes.lib.test.php b/tests/main/exercice/hotpotatoes.lib.test.php
deleted file mode 100755
index b8b6f93020..0000000000
--- a/tests/main/exercice/hotpotatoes.lib.test.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-require_once(api_get_path(SYS_CODE_PATH).'exercise/hotpotatoes.lib.php');
-
-class TestHotpotatoes extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Hotpotatoes exercises library - main/exercise/hotpotatoes.lib.test.php');
-    }
-
-	function testCheckImageName() {
-		$imgparams=array();
-		$string='';
-		$checked = myarraysearch($imgparams,$string);
-		$res=CheckImageName(&$imgparams,$string);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue(is_bool($checked));
-		//var_dump($res);
-	}
-
-	function testCheckSubFolder() {
-		$path='Location: /main/exercise/';
-		$res=CheckSubFolder($path);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testFillFolderName() {
-		$name='testnameofthefolder';
-		$nsize=12;
-		$res=FillFolderName($name,$nsize);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testGenerateHiddenList() {
-		$imgparams=array('test');
-		$res=GenerateHiddenList($imgparams);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-
-
-	}
-
-	function testGenerateHpFolder() {
-		$folder='main/exercise/hotpotatoes.lib.php';
-		$res=GenerateHpFolder($folder);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testGetComment() {
-
-			$course_code = 'COURSETEST';
-			$path = 'exercice_submit.php';
-			$query ="select comment from $dbTable where path='$path'";
-			$res=GetComment($path,$course_code);
-			$this->assertTrue(is_string($res));
-			//var_dump($res);
-
-		}
-
-	/*  Deprecated
-	function testGetFileName() {
-		$fname='main/exercise/hotpotatoes.lib.php';
-		$res=GetFileName($fname);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}*/
-
-	function testGetFolderName() {
-		$fname='main/exercise/hotpotatoes.lib.php';
-		$res=GetFolderName($fname);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testGetFolderPath() {
-		$fname='main/exercise/hotpotatoes.lib.php';
-		$res=GetFolderPath($fname);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testGetImgName() {
-		$imgtag='<img src="example.jpg">';
-		$res=GetImgName($imgtag);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testGetImgParams() {
-		$fname='/main/css/academica/images/bg.jpg';
-		$fpath='main/css/academica/images/';
-		$imgparams= array();
-		$imgcount='';
-		$res=GetImgParams($fname,$fpath,&$imgparams,&$imgcount);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testGetQuizName() {
-		$course_code = 'COURSETEST';
-		$fname='exercice_submit.php';
-		$fpath='main/exercise/exercice_submit.php';
-		$res=GetQuizName($fname,$fpath);
-
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testGetSrcName() {
-		$imgtag='src="test.jpg""';
-		$res=GetSrcName($imgtag);
-		if(!is_string($res))$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testhotpotatoes_init() {
-		$base = api_get_path(SYS_CODE_PATH);
-		$baseWorkDir=$base.'exercise/';
-		$res=hotpotatoes_init($baseWorkDir);
-		$this->assertFalse($res);
-		//var_dump($res);
-	}
-
-	function testHotPotGCt() {
-		$folder='/main/exercise';
-		$flag=4;
-		$userID=1;
-		$res=HotPotGCt($folder,$flag,$userID);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testmyarraysearch() {
-		$array=array();
-		$node='';
-		$res=myarraysearch($array,$node);
-		if(!is_bool($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testReadFileCont() {
-		$full_file_path='';
-		$res=ReadFileCont($full_file_path);
-		if(!is_bool($res))$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testReplaceImgTag() {
-		$content='src="test2.jpg"';
-		$res=ReplaceImgTag($content);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testSetComment() {
-		global $dbTable;
-		$path='/main/exercise';
-		$comment='testing this function';
-		$comment = Database::escape_string($comment);
-		$query = "UPDATE $dbTable set comment='$comment' where path='$path'";
-		$result = Database::query($query);
-		$res=SetComment($path,$comment);
-		$this->assertTrue(is_string($res));
-		//var_dump($resu);
-	}
-
-	function testWriteFileCont() {
-		$course_code = 'COURSETEST';
-		$full_file_path='/main/exercise/';
-		$content='test test test';
-		$res=WriteFileCont($full_file_path,$content);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/forum/forumfunction.inc.test.php b/tests/main/forum/forumfunction.inc.test.php
deleted file mode 100755
index d8e37ef6a0..0000000000
--- a/tests/main/forum/forumfunction.inc.test.php
+++ /dev/null
@@ -1,1248 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
-require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/abstractlink.class.php';
-require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evallink.class.php';
-
-class TestForumFunction extends UnitTestCase {
-
-	public function TestForumFunction() {
-		$this->UnitTestCase('Test forum function');
-	}
-
-	public function __construct() {
-		// The constructor acts like a global setUp for the class
-		require_once api_get_path(SYS_TEST_PATH).'setup.inc.php';
-	}
-
-	/**
-	 * This function add a attachment file into forum
-	 * @param string  a comment about file
-	 * @param int last id from forum_post table
-	 * @return void
-	 */
-	public function testadd_forum_attachment_file() {
-		 global $_course;
-		 $file_comment='testcoment';
-		 $last_id = 1;
-		 $res = add_forum_attachment_file($file_comment,$last_id);
-		 $this->assertTrue(is_null($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function approves a post = change
-	*
-	* @param $post_id the id of the post that will be deleted
-	* @param $action make the post visible or invisible
-	* @return string language variable
-	*/
-
-	public function testapprove_post() {
-		 $action= 'invisible';
-		 $post_id = 1;
-		 $res = approve_post($post_id, $action);
-		 $this->assertTrue(is_string($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function changes the lock status in the database
-	*
-	* @param $content what is it that we want to (un)lock: forum category, forum, thread, post
-	* @param $id the id of the content we want to (un)lock
-	* @param $action do we lock (=>locked value in db = 1) or unlock (=> locked value in db = 0)
-	* @return string, language variable
-	* @todo move to itemmanager
-	*/
-
-	public function testchange_lock_status() {
-		 $content = 'testcontent';
-		 $action= 'invisible';
-		 $id = 1;
-		 $res = change_lock_status($content, $id, $action);
-		 $this->assertTrue(is_string($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function changes the visibility in the database (item_property)
-	*
-	* @param $content what is it that we want to make (in)visible: forum category, forum, thread, post
-	* @param $id the id of the content we want to make invisible
-	* @param $target_visibility what is the current status of the visibility (0 = invisible, 1 = visible)
-	* @todo change the get parameter so that it matches the tool constants.
-	* @todo check if api_item_property_update returns true or false => returnmessage depends on it.
-	* @todo move to itemmanager
-	* @return string language variable
-	*/
-
-	public function testchange_visibility() {
-		 $content= 'testcontent';
-		 $target_visibility = 1;
-		 $id = 1;
-		 $res = change_visibility($content, $id, $target_visibility);
-		 $this->assertTrue(is_string($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function gets the all information of the last (=most recent) post of the thread
-	* This can be done by sorting the posts that have the field thread_id=$thread_id and sort them by post_date
-	* @param $thread_id the id of the thread we want to know the last post of.
-	* @return an bool or array if there is a last post found, false if there is no post entry linked to that thread => thread will be deleted
-	*/
-
-	public function testcheck_if_last_post_of_thread() {
-		 $thread_id = 1;
-		 $res = check_if_last_post_of_thread($thread_id);
-		 if(!is_bool($res)) {
-		  $this->assertTrue(is_array($res));
-		 }
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function counts the number of forums inside a given category
-	* @param $cat_id the id of the forum category
-	* @todo an additional parameter that takes the visibility into account. For instance $countinvisible=0 would return the number
-	* 		of visible forums, $countinvisible=1 would return the number of visible and invisible forums
-	* @return int the number of forums inside the given category
-	*/
-
-	public function testcount_number_of_forums_in_category() {
-		 $cat_id = 1;
-		 $res = count_number_of_forums_in_category($cat_id);
-		 $this->assertTrue(is_numeric($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function counts the number of post inside a thread user
-	* @param 	int Thread ID
-	* @param 	int User ID
-	* @return	int the number of post inside a thread user
-	*/
-
-	public function testcount_number_of_post_for_user_thread() {
-		 $thread_id = 1;
-		 $user_id = 1;
-		 $res = count_number_of_post_for_user_thread($thread_id, $user_id);
-		 $this->assertTrue(is_numeric($res));
-		 //var_dump($res);
-	 }
-
-	/**
-	* This function counts the number of post inside a thread
-	* @param 	int Thread ID
-	* @return	int the number of post inside a thread
-	*/
-
-	public function testcount_number_of_post_in_thread() {
-		 $thread_id = 1;
-		 $res = count_number_of_post_in_thread($thread_id);
-		 $this->assertTrue(is_numeric($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function counts the number of user register in course
-	* @param 	int Course ID
-	* @return	int the number of user register in course
-	*/
-
-	public function testcount_number_of_user_in_course() {
-		 global $cidReq;
-		 $course_id = $cidReq;
-		 $res = count_number_of_user_in_course($course_id);
-		 $this->assertTrue(is_numeric($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	*
-	*  This function show current thread qualify .
-	* @param integer contains the information the current thread id
-	* @param integer contains the information the current session id
-	* @return array or null if is empty
-	*/
-
-	public function testcurrent_qualify_of_thread() {
-		 $thread_id = 1;
-		 $session_id = 1;
-		 $res = current_qualify_of_thread($thread_id,$session_id);
-		 $this->assertTrue(is_null($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	 * Display the search results
-	 * @return void HTML - display the results
-	 */
-
-	 public function testdisplay_forum_search_results() {
-		 global $origin;
-		 $search_term = 'testterm';
-		 ob_start();
-		 $res = display_forum_search_results($search_term);
-		 ob_end_clean();
-		 $this->assertTrue(is_null($res));
-		 //var_dump($res);
-	 }
-
-
-	 /**
-	* This function displays the user image from the profile, with a link to the user's details.
-	* @param 	int 	User's database ID
-	* @param 	str 	User's name
-	* @return 	string 	An HTML with the anchor and the image of the user
-	*/
-
-	public function testdisplay_user_image() {
-		 $name = 'testcontent';
-		 $user_id = 1;
-		 $res = display_user_image($user_id,$name, $origin='');
-		 $this->assertTrue(is_string($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This function displays the firstname and lastname of the user as a link to the user tool.
-	* @param string
-	* @return string HTML
-	*/
-
-	public function testdisplay_user_link() {
-		 $name = 'testcontent';
-		 $user_id = 1;
-		 $res = display_user_link($user_id, $name, $origin='');
-		 $this->assertTrue(is_string($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	 * This function edit a attachment file into forum
-	 * @param string  a comment about file
-	 * @param int Post Id
-	 * @param int attachment file Id
-	 * @return void
-	 */
-
-	 public function testedit_forum_attachment_file() {
-		 $file_comment = 'testcontent';
-		 $id_attach = 1;
-		 $post_id = 1;
-		 $res = edit_forum_attachment_file($file_comment,$post_id,$id_attach);
-		 $this->assertTrue(is_null($res));
-		 //var_dump($res);
-	}
-
-	 /**
-	 * Display the search form for the forum and display the search results
-	 * @return void display an HTML search results
-	 */
-
-	 public function testforum_search() {
-		ob_start();
-		$res = forum_search();
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /** This function gets all the post written by an user
-	 * @param int user id
-	 * @param string db course name
-	 * @return string
-	 */
-
-	 public function testget_all_post_from_user() {
-		global $_course;
-		$course_db = $_course['dbName'];
-		$user_id = 1;
-		$res = get_all_post_from_user($user_id, $course_db);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	 * Show a list with all the attachments according to the post's id
-	 * @param the post's id
-	 * @return array with the post info
-	 */
-
-	 public function testget_attachment() {
-		$post_id = 1;
-		$res = get_attachment($post_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* Retrieve all the information off the forum categories (or one specific) for the current course.
-	* The categories are sorted according to their sorting order (cat_order
-	* @param $id default ''. When an id is passed we only find the information about that specific forum category. If no id is passed we get all the forum categories.
-	* @return an array containing all the information about all the forum categories
-	*/
-
-	public function testget_forum_categories() {
-		$res = get_forum_categories($id='');
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves all the information of a given forumcategory id
-	* @param $forum_id integer that indicates the forum
-	* @return array returns if there are category
-	* @return bool returns if there aren't category
-	*/
-
-	public function testget_forumcategory_information() {
-		$cat_id = 1;
-		$res = get_forumcategory_information($cat_id);
-		if(!is_bool($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	/**
-	* Retrieve all the forums (regardless of their category) or of only one. The forums are sorted according to the forum_order.
-	* Since it does not take the forum category into account there probably will be two or more forums that have forum_order=1, ...
-	* @return an array containing all the information about the forums (regardless of their category)
-	* @todo check $sql4 because this one really looks fishy.
-	*/
-
-	public function testget_forums() {
-		$res = get_forums($id='');
-		if(!is_bool($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves all the fora in a given forum category
-	* @param integer $cat_id the id of the forum category
-	* @return an array containing all the information about the forums (regardless of their category)
-	*/
-
-	public function testget_forums_in_category() {
-		$cat_id = 1;
-		$res = get_forums_in_category($cat_id);
-		if(!is_bool($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	 * This function gets all the forum information of the all the forum of the group
-	 * @param integer $group_id the id of the group we need the fora of (see forum.forum_of_group)
-	 * @return array
-	 * @todo this is basically the same code as the get_forums function. Consider merging the two.
-	 */
-
-	 public function testget_forums_of_group() {
-		$group_id = 1;
-		$res = get_forums_of_group($group_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	  /**
-	*
-	*  This function get qualify historical.
-	* @param integer contains the information the current user id
-	* @param integer contains the information the current thread id
-	* @param boolean contains the information of option to run
-	* @return array()
-	*/
-
-	public function testGetThreadScoreHistory() {
-		$user_id = 1;
-		$thread_id = 1;
-		$opt = true;
-		$res = getThreadScoreHistory($user_id,$thread_id,$opt);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This functions gets all the last post information of a certain forum
-	* @param $forum_id the id of the forum we want to know the last post information of.
-	* @param $show_invisibles
-	* @return array containing all the information about the last post (last_post_id, last_poster_id, last_post_date, last_poster_name, last_poster_lastname, last_poster_firstname)
-	*/
-
-	public function testget_last_post_information() {
-		$forum_id = 1;
-		$res = get_last_post_information($forum_id, $show_invisibles=false);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	  /** This function get the name of an thread by id
-	 * @param int thread_id
-	 * @return String
-	 **/
-
-	 public function testget_name_thread_by_id() {
-		$thread_id = 1;
-		$res = get_name_thread_by_id($thread_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /** This function get the name of an user by id
-	 * @param user_id int
-	 * return String
-	 */
-
-	 public function testget_name_user_by_id() {
-		$user_id = 1;
-		$res = get_name_user_by_id($user_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	 * This function retrieves all the email adresses of the users who wanted to be notified
-	 * about a new post in a certain forum or thread
-	 * @param string $content does the user want to be notified about a forum or about a thread
-	 * @param integer $id the id of the forum or thread
-	 * @return array
-	 */
-
-	  public function testget_notifications() {
-		$id = 1;
-		$content = 'test message notified';
-		$res = get_notifications($content,$id);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	 * Get all the notification subscriptions of the user
-	 * = which forums and which threads does the user wants to be informed of when a new
-	 * post is added to this thread
-	 * @param integer $user_id the user_id of a user (default = 0 => the current user)
-	 * @param boolean $force force get the notification subscriptions (even if the information is already in the session
-	 * @return array
-	 */
-
-	 public function testget_notifications_of_user() {
-		$res = get_notifications_of_user($user_id = 0, $force = false);
-		if(!is_null($res)){
-			$this->assertTrue(is_string($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves all the information of a post
-	* @param $forum_id integer that indicates the forum
-	* @return array returns
-	*/
-
-	public function testget_post_information() {
-		$post_id = 1;
-		$res = get_post_information($post_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* Retrieve all posts of a given thread
-	* @param int $thread_id integer that indicates the forum
-	* @return an array containing all the information about the posts of a given thread
-	*/
-
-	public function testget_posts() {
-		$thread_id = 1;
-		$res = getPosts($thread_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves information of statistical
-	* @param 	int Thread ID
-	* @param 	int User ID
-	* @param 	int Course ID
-	* @return	array the information of statistical
-	*/
-
-	public function testget_statistical_information() {
-		$thread_id = 1;
-		$user_id = 1;
-		$course_id = 1;
-		$res = get_statistical_information($thread_id, $user_id, $course_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	/**
-	* This function retrieves all the information of a thread
-	* @param $forum_id integer that indicates the forum
-	* @return array returns
-	*/
-
-	function testget_thread_information() {
-		$thread_id = 1;
-		$res = get_thread_information($thread_id);
-		if(!is_bool($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function return the posts inside a thread from a given user
-	* @param 	course code
-	* @param 	int Thread ID
-	* @param 	int User ID
-	* @return	int the number of post inside a thread
-	*/
-
-	public function testget_thread_user_post() {
-		global $_course;
-		$thread_id = 1;
-		$course_db = $_course['dbName'];
-		$user_id = 1;
-		$res = get_thread_user_post($course_db, $thread_id, $user_id );
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-	 /**
-	  * @param string
-	  * @param int
-	  * @param int
-	  * @param int
-	  * @return void
-	  */
-	 public function testget_thread_user_post_limit() {
-	 	global $_course;
-		$thread_id = 1;
-		$course_db = $_course['dbName'];
-		$user_id = 1;
-		$res = get_thread_user_post_limit($course_db, $thread_id, $user_id, $limit=10);
-		if(!is_null($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves forum thread users details
-	* @param 	int Thread ID
-	* @param	string	Course DB name (optional)
-	* @return	resource Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
-	*/
-
-	 public function testget_thread_users_details() {
-		$thread_id = 1;
-		$res = get_thread_users_details($thread_id);
-		if(!is_null($res)){
-			$this->assertTrue(is_resource($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves forum thread users not qualify
-	* @param 	int Thread ID
-	* @param	string	Course DB name (optional)
-	* @return	array Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
-	*/
-
-	 public function testget_thread_users_not_qualify() {
-		$thread_id = 1;
-		$res = get_thread_users_not_qualify($thread_id, $db_name = null);
-		if(!is_null($res)){
-			$this->assertTrue(is_resource($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function retrieves forum thread users qualify
-	* @param 	int Thread ID
-	* @param	string	Course DB name (optional)
-	* @return	array Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
-	*/
-
-	 public function testget_thread_users_qualify() {
-		$thread_id = 1;
-		$res = get_thread_users_qualify($thread_id, $db_name = null);
-		if(!is_bool($res)){
-			$this->assertTrue(is_resource($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	 /**
-	* Retrieve all the threads of a given forum
-	* @param int forum id
-	* @return an array containing all the information about the threads
-	*/
-
-	 public function testget_threads() {
-		$forum_id = 1;
-		$res = get_threads($forum_id);
-		if(!is_bool($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	/**
-	* This function retrieves all the unapproved messages for a given forum
-	* This is needed to display the icon that there are unapproved messages in that thread (only the courseadmin can see this)
-	* @param $forum_id the forum where we want to know the unapproved messages of
-	* @return array returns
-	*/
-
-	 public function testget_unaproved_messages() {
-		$forum_id = 1;
-		$res = get_unaproved_messages($forum_id);
-		if(!is_bool($res)){
-			$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	 }
-
-	/**
-	* This function is used to find all the information about what's new in the forum tool
-	* @return void
-	*/
-
-	 public function testget_whats_new() {
-		$res = get_whats_new();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function handles all the forum and forumcategories actions. This is a wrapper for the
-	* forum and forum categories. All this code code could go into the section where this function is
-	* called but this make the code there cleaner.
-	* @return void
-	*/
-
-	public function testhandle_forum_and_forumcategories() {
-		$res = handle_forum_and_forumcategories();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function is called whenever something is made visible because there might be new posts and the user might have indicated that (s)he wanted
-	* to be informed about the new posts by mail.
-	* @param string
-	* @param int
-	* @return string language variable
-	*/
-
-	public function testhandle_mail_cue() {
-		$content = 'test content';
-		$id = 1;
-		$res = handle_mail_cue($content, $id);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function return the html syntax for the image
-	* @param $image_url The url of the image (absolute or relative)
-	* @param $alt The alt text (when the images cannot be displayed). http://www.w3.org/TR/html4/struct/objects.html#adef-alt
-	* @param $title The title of the image. Most browsers display this as 'tool tip'. http://www.w3.org/TR/html4/struct/global.html#adef-title
-	* @todo this is the same as the Display::xxx function, so it can be removed => all calls have to be changed also
-	* @return string url image
-	*/
-
-	public function testicon() {
-		$image_url = api_get_path(WEB_IMG_PATH).'test.png';
-		$res = icon($image_url,$alt='',$title='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* The thread view counter gets increased every time someone looks at the thread
-	* @param int
-	* @return void
-	*/
-
-	public function testincrease_thread_view() {
-		$thread_id = 1;
-		$res = increase_thread_view($thread_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function displays the form for moving a post message to a different (already existing) or a new thread.
-	* @return void HTML
-	*/
-
-	public function testmove_post_form() {
-		ob_start();
-		$res = move_post_form();
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function displays the form for moving a thread to a different (already existing) forum
-	* @return void HTML
-	*/
-
-	public function testmove_thread_form() {
-		ob_start();
-		$res = move_thread_form();
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function moves a forum or a forum category up or down
-	* @param $content what is it that we want to make (in)visible: forum category, forum, thread, post
-	* @param $direction do we want to move it up or down.
-	* @param $id the id of the content we want to make invisible
-	* @todo consider removing the table_item_property calls here but this can prevent unwanted side effects when a forum does not have an entry in
-	* 		the item_property table but does have one in the forum table.
-	* @return string language variable
-	*/
-
-	public function testmove_up_down() {
-		$content = 'test content';
-		$direction = 'test direction';
-		$id = 1;
-		$res = move_up_down($content, $direction, $id);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* Prepares a string or an array of strings for display by stripping slashes
-	* @param mixed	String or array of strings
-	* @return mixed String or array of strings
-	*/
-
-	public function testprepare4display() {
-		$res = prepare4display($input='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	 * Return the link to the forum search page
-	 */
-
-	 public function testsearch_link() {
-		$res = search_link();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function sends the mails for the mail notification
-	* @param array
-	* @param array
-	* @return void
-	*/
-
-	public function testsend_mail() {
-		$res = send_mail($user_info=array(), $thread_information=array());
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This function sends the notification mails to everybody who stated that they wanted to be informed when a new post
-	* was added to a given thread.
-	* @param int  id thread
-	* @param array reply information
-	* @return void
-	*/
-
-	public function testsend_notification_mails() {
-		$thread_id = 1;
-		$reply_info = array('test');
-		$res = send_notification_mails($thread_id, $reply_info);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	 * Get all the users who need to receive a notification of a new post (those subscribed to
-	 * the forum or the thread)
-	 * @param integer $forum_id the id of the forum
-	 * @param integer $thread_id the id of the thread
-	 * @param integer $post_id the id of the post
-	 * @return bool
-	 */
-
-	 public function testsend_notifications() {
-		$res = send_notifications($forum_id=0, $thread_id=0, $post_id=0);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	 * This function stores which users have to be notified of which forums or threads
-	 * @param string $content does the user want to be notified about a forum or about a thread
-	 * @param integer $id the id of the forum or thread
-	 * @return string language variable
-	 */
-
-	 public function testset_notification() {
-	 	$content = 'test content';
-	 	$id = 1;
-		$res = set_notification($content,$id, $add_only = false);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function displays the form that is used to add a forum category.
-	* @param array
-	* @return void HTML
-	*/
-
-	 public function testshow_add_forum_form() {
-	 	ob_start();
-		$res = show_add_forum_form($inputvalues=array());
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function displays the form that is used to add a forum category.
-	* @param array input values
-	* @return void HTML
-	*/
-
-	public function testshow_add_forumcategory_form() {
-	 	ob_start();
-		$res = show_add_forumcategory_form($inputvalues=array());
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function displays the form that is used to add a post. This can be a new thread or a reply.
-	* @param $action is the parameter that determines if we are
-	*					1. newthread: adding a new thread (both empty) => No I-frame
-	*					2. replythread: Replying to a thread ($action = replythread) => I-frame with the complete thread (if enabled)
-	*					3. replymessage: Replying to a message ($action =replymessage) => I-frame with the complete thread (if enabled) (I first thought to put and I-frame with the message only)
-	* 					4. quote: Quoting a message ($action= quotemessage) => I-frame with the complete thread (if enabled). The message will be in the reply. (I first thought not to put an I-frame here)
-	* @return void HTML
-	*/
-
-	public function testshow_add_post_form() {
-	 	ob_start();
-		$res = show_add_post_form($action='', $id='', $form_values='');
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function displays the form that is used to edit a forum category.
-	* This is more or less a copy from the show_add_forumcategory_form public function with the only difference that is uses
-	* some default values. I tried to have both in one public function but this gave problems with the handle_forum_and_forumcategories public function
-	* (storing was done twice)
-	* @param array
-	* @return void HTML
-	*/
-
-	public function testshow_edit_forumcategory_form() {
-	 	ob_start();
-		$res = show_edit_forumcategory_form($inputvalues=array());
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function displays the form that is used to edit a post. This can be a new thread or a reply.
-	* @param array contains all the information about the current post
-	* @param array contains all the information about the current thread
-	* @param array contains all info about the current forum (to check if attachments are allowed)
-	* @param array contains the default values to fill the form
-	* @return void
-	*/
-
-	public function testshow_edit_post_form() {
-	 	ob_start();
-	 	$current_post = array('test');
-	 	$current_thread = array('test2');
-	 	$current_forum = array('test3');
-		$res = show_edit_post_form($current_post, $current_thread, $current_forum, $form_values='',$id_attach=0);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	/**
-	* This public function show qualify.
-	* @param string contains the information of option to run
-	* @param string contains the information the current course id
-	* @param integer contains the information the current forum id
-	* @param integer contains the information the current user id
-	* @param integer contains the information the current thread id
-	* @return integer qualify
-	* @example $option=1 obtained the qualification of the current thread
-	*/
-
-	public function testShowQualify() {
-	 	$option =  1;
-	 	$user_id = 1;
-	 	$thread_id = 1;
-        $res = showQualify($option, $user_id, $thread_id);
-		if(!is_numeric($res)){
-			$this->assertTrue(is_null($res));
-		} else {
-			$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	 }
-
-	/**
-	* This function builds an array of all the posts in a given thread where the key of the array is the post_id
-	* It also adds an element children to the array which itself is an array that contains all the id's of the first-level children
-	* @return an array containing all the information on the posts of a thread
-	*/
-
-	 public function testcalculate_children() {
-		$rows = array();
-		$res = calculate_children($rows);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	 }
-
-	 public function test_forum_recursive_sort() {
-		$rows = array();
-		$res = forumRecursiveSort($rows, &$threads, $seed=0, $indent=0);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-
-	/**
-	* This public function stores the edit of a post in the forum_post table.
-	* @param array
-	* @return void HTML
-	*/
-
-	public function teststore_edit_post() {
-		$values = array('test');
-		ob_start();
-		$res = store_edit_post($values);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function stores the forum in the database. The new forum is added to the end.
-	* @param array
-	* @return string language variable
-	*/
-
-	public function teststore_forum() {
-		$values = array('test');
-		ob_start();
-		$res = store_forum($values);
-		ob_end_clean();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function stores the forum category in the database. The new category is added to the end.
-	* @param array
-	* @return void HMTL language variable
-	*/
-
-	public function teststore_forumcategory() {
-		$values = array('test');
-		ob_start();
-		$res = store_forumcategory($values);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	*
-	* @param array
-	* @return string HTML language variable
-	*/
-
-	public function teststore_move_post() {
-		$values = array('test');
-		ob_start();
-		$res = store_move_post($values);
-		ob_end_clean();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* @param array
-	* @return string HTML language variable
-	*/
-
-	public function teststore_move_thread() {
-		$values = array('test');
-		ob_start();
-		$res = store_move_thread($values);
-		ob_end_clean();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	*
-	*  This public function store qualify historical.
-	* @param boolean contains the information of option to run
-	* @param string contains the information the current course id
-	* @param integer contains the information the current forum id
-	* @param integer contains the information the current user id
-	* @param integer contains the information the current thread id
-	* @param integer contains the information the current qualify
-	* @return void
-	* @example $option=1 obtained the qualification of the current thread
-	*/
-
-	public function testSaveThreadScoreHistory() {
-		$option = 1;
-		$couser_id = 1;
-		$forum_id = 1;
-		$user_id = 1;
-		$thread_id = 1;
-		$current_qualify = 1;
-		$qualify_user_id = 1;
-		$res = saveThreadScoreHistory($option,$couser_id,$forum_id,$user_id,$thread_id,$current_qualify,$qualify_user_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	* This public function stores a reply in the forum_post table.
-	* It also updates the forum_threads table (thread_replies +1 , thread_last_post, thread_date)
-	*/
-
-	public function teststore_reply() {
-		$values = array('test');
-		ob_start();
-		$res = store_reply($values);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 /**
-	 * @param integer contains the information of user id
-	 * @param integer contains the information of thread id
-	 * @param integer contains the information of thread qualify
-	 * @param integer contains the information of user id of qualifier
-	 * @param integer contains the information of time
-	 * @param integer contains the information of session id
-	 * @return Array() optional
-	 **/
- 	 public function testSaveThreadScore()
-	 {
-        $user_id = 1;
-        $thread_id = 1;
-        $qualify_time = 1;
-        $res = saveThreadScore(
-            $user_id,
-            $thread_id,
-            $thread_qualify = 0,
-            $qualify_user_id = 0,
-            $qualify_time,
-            $session_id = null
-        );
-
-        if (!is_bool($res)) {
-            $this->assertTrue(is_array($res));
-        } else {
-            $this->assertTrue(is_bool($res));
-        }
-	 }
-
-	 /**
-	* This public function stores a new thread. This is done through an entry in the forum_thread table AND
-	* in the forum_post table because. The threads are also stored in the item_property table. (forum posts are not (yet))
-	* @param array
-	* @return void HTML
-	*/
-
-	public function teststore_thread() {
-		$values = array();
-		ob_start();
-		$res = store_thread($values);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-
-	/**
-	* The relies counter gets increased every time somebody replies to the thread
-	* @param
-	* @return void
-	*/
-
-	public function testupdate_thread() {
-		$thread_id = 1;
-		$last_post_id = 1;
-		$post_date = 1;
-		$res = update_thread($thread_id, $last_post_id,$post_date);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	  /**
-	 * Delete the all the attachments from the DB and the file according to the post's id or attach id(optional)
-	 * @param post id
-	 * @param attach id (optional)
-	 * @return void
-	 */
-
-	 public function testdelete_attachment() {
-		 global $_course;
-		 $post_id = 1;
-		 $res = delete_attachment($post_id,$id_attach=0);
-		 $this->assertTrue(is_null($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This public function deletes a forum or a forum category
-	* This public function currently does not delete the forums inside the category, nor the threads and replies inside these forums.
-	* For the moment this is the easiest method and it has the advantage that it allows to recover fora that were acidently deleted
-	* when the forum category got deleted.
-	*
-	* @param $content = what we are deleting (a forum or a forum category)
-	* @param $id The id of the forum category that has to be deleted.
-	* @return void
-	* @todo write the code for the cascading deletion of the forums inside a forum category and also the threads and replies inside these forums
-	* @todo config setting for recovery or not (see also the documents tool: real delete or not).
-	*/
-
-	public function testdeleteForumCategoryThread() {
-		 $content= 'testcontent';
-		 $id = 1;
-		 $res = deleteForumCategoryThread($content, $id);
-		 $this->assertTrue(is_null($res));
-		 //var_dump($res);
-	 }
-
-	 /**
-	* This public function deletes the forum image if exists
-	* @param int forum id
-	* @return boolean true if success
-	*/
-
-	 public function testdelete_forum_image() {
-		 $forum_id = 1;
-		 $res = delete_forum_image($forum_id);
-		 $this->assertTrue(is_bool($res));
-		 //var_dump($res);
-	 }
-
-	/**
-	* This public function deletes a forum post. This separate public function is needed because forum posts do not appear in the item_property table (yet)
-	* and because deleting a post also has consequence on the posts that have this post as parent_id (they are also deleted).
-	* an alternative would be to store the posts also in item_property and mark this post as deleted (visibility = 2).
-	* We also have to decrease the number of replies in the thread table
-	* @return string language variable
-	* @param $post_id the id of the post that will be deleted
-	* @todo write recursive public function that deletes all the posts that have this message as parent
-	*/
-
-	 public function testdelete_post() {
-		$table_posts 			= Database :: get_course_table(TABLE_FORUM_POST);
-		$table_threads 		= Database :: get_course_table(TABLE_FORUM_THREAD);
-		$post_id = 1;
-		$res = delete_post($post_id);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	 }
-
-	 public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		require_once api_get_path(SYS_TEST_PATH).'teardown.inc.php';
-	}
-}
-?>
diff --git a/tests/main/gradebook/lib/be/attendancelink.class.test.php b/tests/main/gradebook/lib/be/attendancelink.class.test.php
deleted file mode 100755
index e1730f5989..0000000000
--- a/tests/main/gradebook/lib/be/attendancelink.class.test.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-class TestAttendanceLink extends UnitTestCase {
-
-	public function TestAttendanceLink() {
-		$this->UnitTestCase('Test Attendance Link');
-	}
-
-	public function __construct() {
-        $this->UnitTestCase('Gradebook attendances library - main/gradebook/lib/be/attendancelink.class.test.php');
-	    // The constructor acts like a global setUp for the class
-		global $date;
-		TestManager::create_test_course('COURSEATTENDANCELINK');
-		$this->attendance = new AttendanceLink();
-		$this->attendance->set_course_code('COURSEATTENDANCELINK');
-		$this->attendance->set_id (1);
-		$this->attendance->set_type (LINK_ATTENDANCE);
-		$this->attendance->set_ref_id (1) ;
-		$this->attendance->set_user_id (1);
-		$this->attendance->set_category_id(1);
-		$this->attendance->set_date ($date);
-		$this->attendance->set_weight (1);
-		$this->attendance->set_visible (1);
-		$this->attendance->set_session_id(1);
-	}
-
-	public function testcalc_score() {
-		$res = $this->attendance->calc_score($stud_id = null);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Generate an array of all attendances available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-
-	public function testget_all_links() {
-		$_SESSION['id_session'] = 1;
-		$res = $this->attendance->get_all_links();
-		if(!is_array($res)){
-			$this->assertTrue(is_null($res));
-		} else {
-			$this->assertTrue(is_array($res));
-		}
-		$_SESSION['id_session'] = null;
-		//var_dump($res);
-	}
-
-	/**
-	 * @return string description
-	 */
-
-	public function testget_description() {
-		$res = $this->attendance->get_description();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_link() {
-		$res = $this->attendance->get_link();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_name() {
-		$res = $this->attendance->get_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_not_created_links() {
-		$res = $this->attendance->get_not_created_links();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_test_id() {
-		$res = $this->attendance->get_test_id();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_type_name() {
-		$res = $this->attendance->get_type_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-    * Has anyone done this exercise yet ?
-    */
-
-	public function testhas_results() {
-		$res = $this->attendance->has_results();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testis_allowed_to_change_name() {
-		$res = $this->attendance->is_allowed_to_change_name();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testis_valid_link() {
-		$res = $this->attendance->is_valid_link();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testneeds_max() {
-		$res = $this->attendance->needs_max();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testneeds_name_and_description() {
-		$res = $this->attendance->needs_name_and_description();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testneeds_results() {
-		$res = $this->attendance->needs_results();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		TestManager::delete_test_course('COURSEATTENDANCELINK');
-	}
-}
-?>
diff --git a/tests/main/gradebook/lib/be/category.class.test.php b/tests/main/gradebook/lib/be/category.class.test.php
deleted file mode 100755
index 84de01e4f4..0000000000
--- a/tests/main/gradebook/lib/be/category.class.test.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-
-class TestCategoryClass extends UnitTestCase {
-
-	public function TestCategoryClass() {
-		$this->UnitTestCase('Test Category Class');
-	}
-
-	public function __construct() {
-        $this->UnitTestCase('Gradebook categories library - main/gradebook/lib/be/category.class.test.php');
-	    // The constructor acts like a global setUp for the class
-		TestManager::create_test_course('COURSECATEGORYCLASS');
-		$this->category = new Category();
-		$this->category->set_id(1);
-		$this->category->set_name('test');
-		$this->category->set_description('test description');
-		$this->category->set_user_id(1);
-		$this->category->set_course_code('COURSECATEGORYCLASS');
-		$this->category->set_certificate_min_score(20);
-		$this->category->set_parent_id(0);
-		$this->category->set_session_id(1);
-		$this->category->set_weight(1);
-		$this->category->set_visible(1);
-	}
-
-	/**
-     * Insert this category into the database
-     */
-
-	public function testadd() {
-		$_SESSION['id_session'] = 1;
-		$res = $this->category->add();
-		$this->assertTrue(is_null($res));
-		$_SESSION['id_session'] = null;
-		//var_dump($res);
-	}
-
-	/**
-	 * Apply the same visibility to every subcategory, evaluation and link
-	 */
-
-	public function testapply_visibility_to_children() {
-		$res = $this->category->apply_visibility_to_children();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Calculate the score of this category
-	 * @param $stud_id student id (default: all students - then the average is returned)
-	 * @return	array (score sum, weight sum)
-	 * 			or null if no scores available
-	 */
-
-	public function testcalc_score() {
-		$res = $this->category->calc_score($stud_id = null);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Check if a category name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 * @return bool
-	 */
-
-	public function testdoes_name_exist() {
-		$name = 'test';
-		$parent=1;
-		$res = $this->category->does_name_exist($name, $parent);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-     * Find category by name
-     * @param string $name_mask search string
-     * @return array category objects matching the search criterium
-     */
-
-	public function testfind_category() {
-		$name_mask = 'test';
-		$allcat=array();
-		$res = $this->category->find_category($name_mask,$allcat);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Generate an array of all courses that a teacher is admin of.
-	 * @return array 2-dimensional array - every element contains 2 subelements (code, title)
-	 */
-
-	public function testget_all_courses() {
-		$user_id = 1;
-		$res = $this->category->get_all_courses($user_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_certificate_min_score() {
-		$res = $this->category->get_certificate_min_score();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_course_code() {
-		$res = $this->category->get_course_code();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_description() {
-		$res = $this->category->get_description();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Get appropriate evaluations visible for the user
-	 * @param int $stud_id student id (default: all students)
-	 * @param boolean $recursive process subcategories (default: no recursion)
-	 */
-
-	public function testget_evaluations() {
-		$res = $this->category->get_evaluations($stud_id = null, $recursive = false);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_icon_name() {
-		$res = $this->category->get_icon_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_id() {
-		$res = $this->category->get_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_independent_categories_with_result_for_student() {
-		$cat_id=1;
-		$stud_id=1;
-		$res = $this->category->get_independent_categories_with_result_for_student($cat_id, $stud_id, $cats = array());
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_item_type() {
-		$res = $this->category->get_item_type();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_links() {
-		$res = $this->category->get_links($stud_id = null, $recursive = false);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_name() {
-		$res = $this->category->get_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_not_created_course_categories() {
-		$user_id = 1;
-		$res = $this->category->get_not_created_course_categories($user_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_parent_id() {
-		$res = $this->category->get_parent_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Return array of Category objects where a student is subscribed to.
-	 * @param int       student id
-     * @param string    Course code
-     * @param int       Session id
-	 */
-
-	public function testget_root_categories_for_student() {
-		$stud_id=1;
-		$res = $this->category->get_root_categories_for_student($stud_id, $course_code = null, $session_id = null);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Return array of Category objects where a teacher is admin for.
-	 * @param int user id (to return everything, use 'null' here)
-     * @param string course code (optional)
-     * @param int session id (optional)
-	 */
-
-	public function testget_root_categories_for_teacher() {
-		$user_id=1;
-		$res = $this->category->get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_session_id() {
-		$user_id=1;
-		$res = $this->category->get_session_id($user_id, $course_code = null, $session_id = null);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Get appropriate subcategories visible for the user (and optionally the course and session)
-	 * @param int      $stud_id student id (default: all students)
-     * @param string   Course code (optional)
-     * @param int      Session ID (optional)
-     * @return  array   Array of subcategories
-	 */
-
-	public function testget_subcategories() {
-		$res = $this->category->get_subcategories($stud_id = null, $course_code = null, $session_id = null);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Generate an array of possible categories where this category can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-
-	public function testget_target_categories() {
-		$res = $this->category->get_target_categories();
-		if(is_array($res)) {
-		$this->assertTrue(is_array($res));
-		} else {
-			$this->assertTrue(is_null($res));
-		}
-		var_dump($res);
-
-	}
-
-	/**
-	 * Generate an array of all categories the user can navigate to
-	 */
-
-	public function testget_tree() {
-		$res = $this->category->get_tree();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_user_id() {
-		$res = $this->category->get_user_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_weight() {
-		$res = $this->category->get_weight();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Check if a category contains evaluations with a result for a given student
-	 */
-
-	public function testhas_evaluations_with_results_for_student() {
-		$stud_id = 1;
-		$res = $this->category->has_evaluations_with_results_for_student($stud_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Checks if the certificate is available for the given user in this category
-	 * @param	integer	User ID
-	 * @return	boolean	True if conditions match, false if fails
-	 */
-
-	public function testis_certificate_available() {
-		$user_id = 1;
-		$res = $this->category->is_certificate_available($user_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Is this category a course ?
-	 * A category is a course if it has a course code and no parent category.
-	 */
-
-	public function testis_course() {
-		$res = $this->category->is_course();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Can this category be moved to somewhere else ?
-	 * The root and courses cannot be moved.
-	 */
-
-	public function testis_movable() {
-		$res = $this->category->is_movable();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testis_visible() {
-		$res = $this->category->is_visible();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Retrieve categories and return them as an array of Category objects
-	 * @param int      category id
-	 * @param int      user id (category owner)
-	 * @param string   course code
-	 * @param int      parent category
-	 * @param bool     visible
-     * @param int      session id (in case we are in a session)
-     * @param bool     Whether to show all "session" categories (true) or hide them (false) in case there is no session id
-	 */
-
-	public function testload() {
-		$res = $this->category->load($id = null, $user_id = null, $course_code = null, $parent_id = null, $visible = null, $session = null, $show_session_categories = true);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Move this category to the given category.
-	 * If this category moves from inside a course to outside,
-	 * its course code must be changed, as well as the course code
-	 * of all underlying categories and evaluations. All links will
-	 * be deleted as well !
-	 */
-
-	public function testmove_to_cat() {
-		$res = $this->category->move_to_cat($this->category);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-
-	/**
-	 * Update the properties of this category in the database
-	 */
-
-	public function testsave() {
-		$res = $this->category->save();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Show message resource delete
-	 */
-
-	public function testshow_message_resource_delete() {
-		$course_id = 1;
-		$res = $this->category->show_message_resource_delete($course_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Shows all information of an category
-	 */
-
-	public function testshows_all_information_an_category() {
-		$res = $this->category->shows_all_information_an_category($selectcat='');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Not delete this category from the database,when visible=3 is category eliminated
-	 */
-
-	public function testupdate_category_delete() {
-		$course_id = 1;
-		$res = $this->category->update_category_delete($course_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Delete this evaluation from the database
-	 */
-
-	public function testdelete() {
-		$res = $this->category->delete();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Delete this category and every subcategory, evaluation and result inside
-	 */
-
-	public function testdelete_all() {
-		$res = $this->category->delete_all();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		TestManager::delete_test_course('COURSECATEGORYCLASS');
-	}
-}
-?>
diff --git a/tests/main/gradebook/lib/be/dropboxlink.class.test.php b/tests/main/gradebook/lib/be/dropboxlink.class.test.php
deleted file mode 100755
index 7fdc4cfbfd..0000000000
--- a/tests/main/gradebook/lib/be/dropboxlink.class.test.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-class TestDropBoxLink extends UnitTestCase {
-
-	public function TestDropBoxLink() {
-		$this->UnitTestCase('Test Drop Box Link');
-	}
-
-	public function __construct() {
-        $this->UnitTestCase('Gradebook dropbox library - main/gradebook/lib/be/dropboxlink.class.test.php');
-	    // The constructor acts like a global setUp for the class
-		TestManager::create_test_course('COURSEDROPBOXLINK');
-		$this->dropbox = new DropboxLink();
-		$this->dropbox->set_course_code('COURSEDROPBOXLINK');
-		$this->dropbox->set_name('test');
-	}
-
-	public function testget_type_name() {
-		$res = $this->dropbox->get_type_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_view_url() {
-		$stud_id = 1;
-		$res = $this->dropbox->get_view_url($stud_id);
-		//$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testis_allowed_to_change_name() {
-		$res = $this->dropbox->is_allowed_to_change_name();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		TestManager::delete_test_course('COURSEDROPBOXLINK');
-	}
-}
-?>
diff --git a/tests/main/gradebook/lib/be/evaluation.class.test.php b/tests/main/gradebook/lib/be/evaluation.class.test.php
deleted file mode 100755
index c2abdabab8..0000000000
--- a/tests/main/gradebook/lib/be/evaluation.class.test.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-class TestEvaluation extends UnitTestCase {
-
-	public function TestEvaluation() {
-		$this->UnitTestCase('Test Evaluation');
-	}
-
-	public function __construct() {
-        $this->UnitTestCase('Gradebook evaluation library - main/gradebook/lib/be/evaluation.class.test.php');
-	    // The constructor acts like a global setUp for the class
-		global $date;
-		TestManager::create_test_course('COURSEEVALUATION');
-		$this->evaluation = new Evaluation();
-		$this->evaluation-> set_id (1);
-		$this->evaluation-> set_name ('test');
-		$this->evaluation-> set_description ('test description');
-		$this->evaluation-> set_user_id (1);
-		$this->evaluation-> set_course_code ('COURSEEVALUATION');
-		$this->evaluation-> set_category_id (1);
-		$this->evaluation-> set_date ($date);
-		$this->evaluation-> set_weight (1);
-		$this->evaluation-> set_max (1);
-		$this->evaluation-> set_visible (1);
-	}
-
-	/**
-	* Insert this evaluation into the database
-	*/
-
-	public function testadd() {
-		$res = $this->evaluation->add();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testadd_evaluation_log() {
-		$idevaluation = 1;
-		$res = $this->evaluation->add_evaluation_log($idevaluation);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	* Calculate the score of this evaluation
-	* @param $stud_id student id (default: all students who have results for this eval - then the average is returned)
-	* @return	array (score, max) if student is given
-	* 			array (sum of scores, number of scores) otherwise
-	* 			or null if no scores available
-	*/
-
-	public function testcalc_score() {
-		$res = $this->evaluation->calc_score($stud_id = null);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	* Delete this evaluation from the database
-	*/
-
-	public function testdelete() {
-		$res = $this->evaluation->delete();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-    * Delete all results for this evaluation
-    */
-
-    public function testdelete_results() {
-		$res = $this->evaluation->delete_results();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-    * Delete this evaluation and all underlying results.
-    */
-
-    public function testdelete_with_results() {
-		$res = $this->evaluation->delete_with_results();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Check if an evaluation name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 */
-
-	public function testdoes_name_exist() {
-		$name = 'test name';
-		$parent = 1;
-		$res = $this->evaluation->does_name_exist($name, $parent);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-	* Find evaluations by name
-	* @param string $name_mask search string
-	* @return array evaluation objects matching the search criterium
-	* @todo can be written more efficiently using a new (but very complex) sql query
-	*/
-	//problem with the call get_evaluations():  Call to a member function get_evaluations() on a non-object
-	/*public function testfind_evaluations() {
-		$name_mask = 'test name mask';
-		$selectcat = 1;
-		$res = Evaluation::find_evaluations($name_mask,$selectcat);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}*/
-
-	public function testget_category_id() {
-		$res = $this->evaluation->get_category_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_course_code() {
-		$res = $this->evaluation->get_course_code();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_date() {
-		$res = $this->evaluation->get_date();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testget_description() {
-		$res = $this->evaluation->get_description();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Retrieve evaluations where a student has results for
-	 * and return them as an array of Evaluation objects
-	 * @param $cat_id parent category (use 'null' to retrieve them in all categories)
-	 * @param $stud_id student id
-	 */
-
-	public function testget_evaluations_with_result_for_student() {
-		$stud_id = 1;
-		$res = $this->evaluation->get_evaluations_with_result_for_student($cat_id = null, $stud_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_icon_name() {
-		$res = $this->evaluation->get_icon_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_id() {
-		$res = $this->evaluation->get_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_item_type() {
-		$res = $this->evaluation->get_item_type();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_max() {
-		$res = $this->evaluation->get_max();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_name() {
-		$res = $this->evaluation->get_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-     * Get a list of students that do not have a result record for this evaluation
-     */
-
-	public function testget_not_subscribed_students() {
-		$res = $this->evaluation->get_not_subscribed_students($first_letter_user = '');
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Generate an array of possible categories where this evaluation can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-
-	public function testget_target_categories() {
-		$res = $this->evaluation->get_target_categories();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_user_id() {
-		$res = $this->evaluation->get_user_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testget_weight() {
-		$res = $this->evaluation->get_weight();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Are there any results for this evaluation yet ?
-	 * The 'max' property should not be changed then.
-	 */
-
-	public function testhas_results() {
-		$res = $this->evaluation->has_results();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testis_valid_score() {
-		$score = 1;
-		$res = $this->evaluation->is_valid_score($score);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testis_visible() {
-		$res = $this->evaluation->is_visible();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Retrieve evaluations and return them as an array of Evaluation objects
-	 * @param $id evaluation id
-	 * @param $user_id user id (evaluation owner)
-	 * @param $course_code course code
-	 * @param $category_id parent category
-	 * @param $visible visible
-	 */
-
-	public function testload() {
-		$res = $this->evaluation->load($id = null, $user_id = null, $course_code = null, $category_id = null, $visible = null);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Move this evaluation to the given category.
-	 * If this evaluation moves from inside a course to outside,
-	 * its course code is also changed.
-	 */
-
-	public function testmove_to_cat() {
-		$cat = $this->evaluation;
-		$res = $this->evaluation->move_to_cat($cat);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Update the properties of this evaluation in the database
-	 */
-
-	public function testsave() {
-		$res = $this->evaluation->save();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_category_id() {
-		$res = $this->evaluation->set_category_id(1);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_course_code() {
-		$res = $this->evaluation->set_course_code('COURSEEVALUATION');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_date() {
-		global $date;
-		$res = $this->evaluation->set_date('02/02/2010');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_description() {
-		$res = $this->evaluation->set_description('test description');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_id() {
-		$res = $this->evaluation->set_id(1);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_max() {
-		$res = $this->evaluation->set_max(1);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_name() {
-		$res = $this->evaluation->set_name('test name');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_user_id() {
-		$res = $this->evaluation->set_user_id(1);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_visible() {
-		$res = $this->evaluation->set_visible(1);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testset_weight() {
-		$res = $this->evaluation->set_weight(1);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		TestManager::delete_test_course('COURSEEVALUATION');
-	}
-}
-?>
diff --git a/tests/main/gradebook/lib/be/exerciselink.class.test.php b/tests/main/gradebook/lib/be/exerciselink.class.test.php
deleted file mode 100755
index 773fe039e2..0000000000
--- a/tests/main/gradebook/lib/be/exerciselink.class.test.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-class TestExerciseLink extends UnitTestCase {
-
-	public function TestExerciseLink() {
-		$this->UnitTestCase('Test Exercise Link');
-	}
-
-	public function __construct() {
-        $this->UnitTestCase('Gradebook exercises library - main/gradebook/lib/be/exerciselink.class.test.php');
-	    global $date;
-		// The constructor acts like a global setUp for the class
-		TestManager::create_test_course('COURSEEXERCISELINK');
-		$this->exerciselink = new ExerciseLink();
-		$this->exerciselink-> set_id (1);
-		$this->exerciselink-> set_name ('test');
-		$this->exerciselink-> set_description ('test description');
-		$this->exerciselink-> set_user_id (1);
-		$this->exerciselink-> set_course_code ('COURSEEXERCISELINK');
-		$this->exerciselink-> set_category_id (1);
-		$this->exerciselink-> set_date ($date);
-		$this->exerciselink-> set_weight (1);
-		$this->exerciselink-> set_max (1);
-		$this->exerciselink-> set_visible (1);
-	}
-
-	/**
-	 * Generate an array of all exercises available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-
-	public function testget_all_links() {
-		$res = $this->exerciselink->get_all_links();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Get the score of this exercise. Only the first attempts are taken into account.
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-
-	public function testcalc_score() {
-		$res = $this->exerciselink->calc_score($stud_id = null);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-
-
-	/**
-     * Get description to display: same as exercise description
-     */
-
-	public function testget_description() {
-		$res = $this->exerciselink->get_description();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-    * Get URL where to go to if the user clicks on the link.
-    * First we go to exercise_jump.php and then to the result page.
-    * Check this php file for more info.
-    */
-
-	public function testget_link() {
-		$res = $this->exerciselink->get_link();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-     * Get name to display: same as exercise title
-     */
-
-    public function testget_name() {
-		$res = $this->exerciselink->get_name();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Generate an array of exercises that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-
-	public function testget_not_created_links() {
-		$_SESSION['id_session'] = 1;
-		$res = $this->exerciselink->get_not_created_links();
-		$this->assertTrue(is_array($res));
-		$_SESSION['id_session'] = null;
-		//var_dump($res);
-	}
-
-	public function testget_type_name() {
-		$res = $this->exerciselink->get_type_name();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-     * Has anyone done this exercise yet ?
-     */
-
-    public function testhas_results() {
-		$res = $this->exerciselink->has_results();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testis_allowed_to_change_name() {
-		$res = $this->exerciselink->is_allowed_to_change_name();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-    * Check if this still links to an exercise
-    */
-
-	public function testis_valid_link() {
-		$res = $this->exerciselink->is_valid_link();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-    public function testneeds_max() {
-		$res = $this->exerciselink->needs_max();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testneeds_name_and_description() {
-		$res = $this->exerciselink->needs_name_and_description();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testneeds_results() {
-		$res = $this->exerciselink->needs_results();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		TestManager::delete_test_course('COURSEEXERCISELINK');
-	}
-}
-?>
diff --git a/tests/main/gradebook/lib/be/forumthreadlink.class.test.php b/tests/main/gradebook/lib/be/forumthreadlink.class.test.php
deleted file mode 100755
index d3e233be24..0000000000
--- a/tests/main/gradebook/lib/be/forumthreadlink.class.test.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-class TestForumThreadLink extends UnitTestCase {
-
-	public function TestForumThreadLink() {
-		$this->UnitTestCase('Test Forum Thread Link');
-	}
-
-	public function __construct() {
-        $this->UnitTestCase('Gradebook forum library - main/gradebook/lib/be/forumthreadlink.class.test.php');
-	    // The constructor acts like a global setUp for the class
-		TestManager::create_test_course('COURSEFORUMTHREAD');
-		$this->forumthreadlink = new ForumThreadLink();
-		$this->forumthreadlink->set_id(1);
-		$this->forumthreadlink->set_type(5);
-		$this->forumthreadlink->set_ref_id(1);
-		$this->forumthreadlink->set_user_id(1);
-		$this->forumthreadlink->set_course_code('COURSEFORUMTHREAD');
-		$this->forumthreadlink->set_category_id(1);
-		$this->forumthreadlink->set_date(date);
-		$this->forumthreadlink->set_weight(1);
-		$this->forumthreadlink->set_visible('visible');
-
-	}
-
-	public function testcalc_score() {
-		$res = $this->forumthreadlink->calc_score(null);
-		$this->assertNull($res);
-		//var_dump($res);
-		$res2 = $this->forumthreadlink->calc_score(1);
-		$this->assertTrue(is_array($res2));
-		//var_dump($res2);
-	}
-
-
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		TestManager::delete_test_course('COURSEFORUMTHREAD');
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/tests/main/inc/banner.inc.test.php b/tests/main/inc/banner.inc.test.php
deleted file mode 100755
index e14ddf8226..0000000000
--- a/tests/main/inc/banner.inc.test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class TestBanner extends UnitTestCase
-{
-
-    public function TestBanner()
-    {
-        $this->UnitTestCase('Banners library - main/inc/banner.inc.test.php');
-    }
-
-    public function testGetTabs()
-    {
-        ob_start();
-        require_once(api_get_path(SYS_CODE_PATH).'inc/banner.inc.php');
-        ob_end_clean();
-        $res = get_tabs();
-        $this->assertTrue(is_array($res));
-        $this->assertTrue($res);
-        //var_dump($res);
-    }
-}
diff --git a/tests/main/inc/course_document.lib.test.php b/tests/main/inc/course_document.lib.test.php
deleted file mode 100755
index d91337584b..0000000000
--- a/tests/main/inc/course_document.lib.test.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-class Testcdocu extends UnitTestCase{
-
-    public function __construct(){
-        $this->UnitTestCase('Course documents display library - main/inc/course_document.inc.test.php');
-    }
-
-	public function testGetlist(){
-		global $is_allowed_in_course;
-		$is_allowed_in_course = true;
-		$directory = api_get_path(SYS_COURSE_PATH).'/document/audio/';
-		$res = getlist($directory);
-		if (is_bool($res)){
-			$this->assertTrue(is_bool($res));
-			$this->assertTrue($res ===false);
-		} else{
-			$this->assertTrue(is_null($res));
-		}
-
-
-	}
-
-	public function testCheckAndCreateResourceDirectory(){
-		global $_course, $_user;
-		global $group_properties, $to_group_id;
-		global $permissions_for_new_directories;
-		$repository_path='';
-		$resource_directory='';
-		$resource_directory_name='';
-		$res = check_and_create_resource_directory($repository_path, $resource_directory, $resource_directory_name);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res === false);
-	}
-}
diff --git a/tests/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php b/tests/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php
deleted file mode 100755
index 35a4357f6d..0000000000
--- a/tests/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-//require_once(api_get_path(INCLUDE_PATH).'global.inc.php');
-//require_once(api_get_path(SYS_CODE_PATH).'admin/access_url_edit_courses_to_url.php');
-require_once(api_get_path(LIBRARY_PATH).'access_url_edit_courses_to_url_functions.lib.php');
-
-class TestAccessUrlEditCoursesToUrlFunctions extends UnitTestCase{
-
-    public function __construct(){
-        $this->UnitTestCase('Access URL courses library - main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php');
-    }
-
-	public function setUp(){
-		$this->AccessUrlEditCoursesToUrl = new Accessurleditcoursestourl();
-	}
-
-	public function tearDown(){
-		$this->AccessUrlEditCoursesToUrl = null;
-	}
-
-	public function TestSearchCourses(){
-		global $_course, $user_id;
-		$needle = '';
-		$id = $_course['id'];
-		$res = Accessurleditcoursestourl::search_courses($needle, $id);
-		$this->assertTrue($res);
-		$this->assertTrue(is_object($res));
-		$this->assertFalse(is_null($res));
-		//var_dump($res);
-	}
-
-
-
-}
-
-?>
diff --git a/tests/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php b/tests/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php
deleted file mode 100755
index f2bb8cbec3..0000000000
--- a/tests/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-require_once(api_get_path(LIBRARY_PATH).'access_url_edit_sessions_to_url_functions.lib.php');
-
-class TestAccessUrlEditSessionsToUrlFunctions extends UnitTestCase{
-
-    public function __construct(){
-        $this->UnitTestCase('Access URL sessions library - main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php');
-    }
-
-	public function setUp(){
-		$this->AccessUrlEditSessionsToUrl = new Accessurleditsessionstourl();
-	}
-
-	public function tearDown(){
-		$this->AccessUrlEditSessionsToUrl = null;
-	}
-
-	public function TestSearchSessions(){
-		global $_courses;
-		$needle = '';
-		$id = $_courses['id'];
-		$res = Accessurleditsessionstourl::search_sessions($needle, $id);
-		$this->assertTrue($res);
-		$this->assertTrue(is_object($res));
-		$this->assertFalse(is_null($res));
-		//var_dump($res);
-
-	}
-
-}
-?>
diff --git a/tests/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php b/tests/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php
deleted file mode 100755
index 90d21f2f73..0000000000
--- a/tests/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-require_once(api_get_path(LIBRARY_PATH).'access_url_edit_users_to_url_functions.lib.php');
-
-class TestAccessUrlEditUsersToUrlFunctions extends UnitTestCase{
-
-    public function __construct(){
-        $this->UnitTestCase('Access URL users library - main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php');
-    }
-
-	public function setUp(){
-		$this->AccessUrlEditUsersToUrl = new AccessurleditUserstourl();
-	}
-
-	public function tearDown(){
-		$this->AccessUrlEditUsersToUrl = null;
-	}
-
-	public function TestSearchUsers(){
-		global $_courses;
-		$needle = '';
-		$id = $_courses['id'];
-		$res = AccessurleditUserstourl::search_users($needle, $id);
-		$this->assertTrue($res);
-		$this->assertTrue(is_object($res));
-		$this->assertFalse(is_null($res));
-		//var_dump($res);
-
-	}
-
-}
-
-?>
diff --git a/tests/main/inc/lib/add_course.lib.inc.test.php b/tests/main/inc/lib/add_course.lib.inc.test.php
deleted file mode 100755
index cb6cdc4d41..0000000000
--- a/tests/main/inc/lib/add_course.lib.inc.test.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-
-class TestAddCourse extends UnitTestCase {
-
-    function TestAddCourse() {
-        $this->UnitTestCase('Courses creation - main/inc/lib/add_course.lib.inc.test.php');
-    }
-/*
-    function TestCreateCourse(){
-        global $_configuration;
-        $course_datos = array(
-                'wanted_code'=> 'testcourse',
-                'title'=>'prueba01',
-                'tutor_name'=>'John Doe',
-                'category_code'=>'Lang',
-                'course_language'=>'english',
-                'course_admin_id'=>'1',
-                'db_prefix'=> $_configuration['db_prefix'],
-                'firstExpirationDelay'=>'120'
-                );
-        $res = create_course($course_datos['wanted_code'], $course_datos['title'],
-                             $course_datos['tutor_name'], $course_datos['category_code'],
-                             $course_datos['course_language'],$course_datos['course_admin_id'],
-                             $course_datos['db_prefix'], $course_datos['firstExpirationDelay']);
-        //should be code string if succeeded (false if failed)
-        $this->assertTrue(is_string($res));
-    }*/
-
-    function testRegisterCourse() {
-        global $_configuration;
-         $course = array(
-            'courseSysCode'=> 'testcourse',
-            'courseScreenCode' =>'testcourse',
-            'courseRepository' =>'testcourse',
-            'courseDbName' => $_configuration['db_prefix'].'testcourse',
-            'titular' =>'John Doe',
-            'category' =>'Lang',
-            'title' =>'test course',
-            'course_language' =>'english',
-            'uidCreator'=> '1',
-            );
-        $res = AddCourse::register_course($course['courseSysCode'],$course['courseScreenCode'],
-                            $course['courseRepository'],$course['courseDbName'],
-                            $course['titular'],$course['category'],$course['title'],
-                            $course['course_language'],$course['uidCreator'],
-                            null,null
-                            );
-
-        $this->assertTrue($res === 0);
-        $res = CourseManager::delete_course($course['courseSysCode']);
-
-    }
-
-    function TestGenerateCourseCode(){
-        global $charset;
-        $course_title = 'testcourse';
-        $res = CourseManager::generate_course_code($course_title);
-        $this->assertTrue($res);
-    }
-
-
-    function TestDefineCourseKeys(){
-        global $prefixAntiNumber, $_configuration;
-        $wantedCode = CourseManager::generate_course_code($wantedCode);
-        $res = AddCourse::define_course_keys(CourseManager::generate_course_code($wantedCode), null, null, null,null, null);
-        $this->assertTrue($res);
-    }
-
-    function TestBrowseFolders(){
-        $browse = array('path'=>'','file'=>'','media'=>'');
-        $res = AddCourse::browse_folders($browse['path'], $browse['files'],$browse['media']);
-        $this->assertFalse($res);
-    }
-    /*
-    // 1 excepcion
-    function TestSortPictures(){
-        $picture = array('files'=>'science.jpg', 'type'=>'jpg');
-        $res = sort_pictures($picture['file'],$picture['type']);
-        $this->assertTrue(is_array($res));
-        //var_dump($res);
-    }
-    */
-    /*
-    function TestFillCourseRepository(){
-        $courseRepository = 'testcourse';
-        $res = fill_course_repository($courseRepository);
-        $this->assertTrue($res);
-    }
-*/
-
-    function TestFillDbCourse(){
-        global $_configuration, $_user;
-        $courseDbName = $_configuration['table_prefix'].$courseDbName.$_configuration['db_glue'];
-        $courseRepository = (api_get_path(SYS_COURSE_PATH).$courseRepository . "/dropbox/.htaccess");
-        $language = 'english';
-        $language_interface = $language;
-        $default_document_array = array();
-        $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $courseDbName = $_configuration['db_prefix'].$courseDbName.$_configuration['db_glue'];
-        $courseRepository = 'testcourse';
-        $language = 'english';
-        $default_document_array ='testdocument';
-        $res = AddCourse::fill_db_course($courseDbName, $courseRepository, $language);
-        $this->assertTrue($res === 0);
-    }
-
-    function TestString2Binary(){
-        $variable = true;
-        $res = AddCourse::string2binary($variable);
-        $this->assertTrue($res);
-    }
-
-    public function TestDeleteCourse(){
-        $code = 'testcourse';
-        $res = CourseManager::delete_course($code);
-        $path = api_get_path(SYS_PATH).'archive';
-        if ($handle = opendir($path)) {
-            while (false !== ($file = readdir($handle))) {
-                if (strpos($file,$code)!==false) {
-                    if (is_dir($path.'/'.$file)) {
-                        rmdirr($path.'/'.$file);
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
-}
diff --git a/tests/main/inc/lib/add_courses_to_sessions_functions.lib.test.php b/tests/main/inc/lib/add_courses_to_sessions_functions.lib.test.php
deleted file mode 100755
index a8c125d93b..0000000000
--- a/tests/main/inc/lib/add_courses_to_sessions_functions.lib.test.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-require_once(api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php');
-
-class TestAddCoursesToSessionFunctions extends UnitTestCase{
-
-    public function __construct(){
-        $this->UnitTestCase('Courses-sessions library - main/inc/lib/add_courses_to_sessions_functions.lib.test.php');
-    }
-
-	public function setUp(){
-		$this->TestAddCoursesToSessionFunctions = new AddCourseToSession();
-	}
-
-	public function tearDown(){
-		$this->TestAddCoursesToSessionFunctions = null;
-	}
-
-	public function TestSearchCourses(){
-		global $_courses;
-		global $tbl_course, $tbl_session_rel_course, $id_session;
-		$needle = '';
-		$type = '';
-		$res = AddCourseToSession::search_courses($needle, $type);
-		$this->assertTrue($res);
-		$this->assertTrue(is_object($res));
-		$this->assertFalse(is_null($res));
-		//var_dump($res);
-
-	}
-
-}
-
-?>
diff --git a/tests/main/inc/lib/add_many_session_to_category_functions.lib.test.php b/tests/main/inc/lib/add_many_session_to_category_functions.lib.test.php
deleted file mode 100755
index 8e81719059..0000000000
--- a/tests/main/inc/lib/add_many_session_to_category_functions.lib.test.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-require_once (api_get_path(LIBRARY_PATH).'add_many_session_to_category_functions.lib.php');
-
-class TestAddManySessionToCategoryFunctions extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('Sessions to category library - main/inc/lib/add_many_session_to_category_functions.lib.test.php');
-    }
-
-	public function setUp(){
-		$this-> AddManySessionToCategory = new AddManySessionToCategoryFunctions();
-	}
-
-	public function tearDown(){
-		$this-> AddManySessionToCategory = null;
-
-	}
-	public function Testsearchcourses(){
-		global $_courses, $tbl_course, $tbl_session, $id_session;
-		$needle ='';
-		$type ='';
-		$res = AddManySessionToCategoryFunctions::search_courses($needle,$type);
-		$this->assertTrue($res);
-		$this->assertTrue(is_object($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/blog.lib.test.php b/tests/main/inc/lib/blog.lib.test.php
deleted file mode 100755
index 82b6d50a19..0000000000
--- a/tests/main/inc/lib/blog.lib.test.php
+++ /dev/null
@@ -1,598 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'blog.lib.php');
-ob_start();
-
-//require_once(api_get_path(SYS_CODE_PATH).'permissions/blog_permissions.inc.php');
-ob_end_clean();
-class TestBlog extends UnitTestCase
-
-{
-	 public $oblog;
-	 public function TestBlog()
-
-	 {
-
-	 	$this->UnitTestCase('Blog Manipulation tests');
-
-	 }
-
-	 public function setUp()
-	 {
- 	 	$this-> oblog = new Blog();
-	 }
-
-	 public function tearDown()
-	 {
-	 	$this->oblog = null;
-	 }
-
-	 /*
-	 * todo public function testGetBlobTitle()
-	 * todo public function testGetBlogSubtitle()
-	 * todo public function testGetBlogUsers()
-	 * todo public function testCreateBlog()
-	 * todo public function testEditBlog()
-	 * todo public function testDeleteBlog()
-	 * todo public function testCreatePost()
-	 * todo public function testEditPost()
-	 * todo public function testDeletePost()
-	 * todo public function testCreateComment()
-	 * todo public function testDeleteComment()
-	 * todo public function testCreateTask()
-	 * todo public function testEditTask()
-	 * todo public function testDeleteTask()
-	 * todo public function testDeleteAssignedTask()
-	 * todo public function testGetPersonalTaskList()
-	 * todo public function testChangeBlogVisibility()
-	 * todo public function testDisplayBlogPosts()
-	 * todo public function testDisplaySearchResults()
-	 * todo public function testDisplayDayResults()
-	 * todo public function testDisplayPost()
-	 * todo public function testAddRating()
-	 * todo public function testDisplayRating()
-	 * todo public function testDisplayRatingForm()
-	 * todo public function testGetThreadedComments()
-	 * todo public function testDisplayformNewPost()
-	 * todo public function testDisplayFormEditPost()
-	 * todo public function testDisplayTaskList()
-	 * todo public function testDisplayAssignedTaskList()
-	 * todo public function testDisplayNewTaskForm()
-	 * todo public function testDisplayEditTaskForm()
-	 * todo public function testDisplayAssignTaskForm()
-	 * todo public function testDisplayEditAssignedTaskForm()
-	 * todo public function testAssignTask()
-	 * todo public function testEditAssignedTask()
-	 * todo public function testDisplaySelectTaskPost()
-	 * todo public function testSetUserSubscribed()
-	 * todo public function testSetUserUnsubscribed()
-	 * todo public function testDisplayFormUserSubscribe()
-	 * todo public function testDisplayFormUserUnsubscribe()
-	 * todo public function testDisplayNewCommentForm()
-	 * todo public function testDisplayMinimonthcalendar()
-	 * todo public function testDisplayNewBlogForm()
-	 * todo public function testDisplayEditBlogForm()
-	 * todo public function testDisplayBlogList()
-	 * todo public function testDisplayBlogList()
-	 */
-
-	 /**
-	  * Test about get Title to a Blog
-	 */
-
-	 public function testGetBlogTitle(){
-
-	 	global $_course;
-	 	$res = $this->oblog->get_Blog_title(11);
-	 	$this->assertFalse($this->oblog->get_Blog_title(11)===String);
-	 	$this->assertTrue(is_String($res));
-	 }
-
-	 public function testGetBlogSubtitle(){
-	  	$res = $this->oblog->get_Blog_subtitle(0);
-	 	$this->assertFalse($this->oblog->get_Blog_subtitle(0)=== null);
-	 	$this->assertTrue(is_String($res));
-	 	$this->assertNotNull($res);
-	 }
-
-	 public function testGetBlogUsers(){
-	 	$res = $this->oblog->get_Blog_users(11);
-	 	$this->assertTrue($this->oblog->get_Blog_users(1110)===array());
-	 	$this->assertTrue(is_array($res));
-	 }
-
-	 public function testCreateBlog(){
-	 	global $_user;
-	 	$res = $this->oblog->create_Blog('testingBlog','pass');
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertNull($res);
-		$this->assertFalse($res);
-	 }
-
-	 public function testEditBlog(){
-	 	global $_user;
-	 	$blog_id = 1;
-	 	$title = 'titulo1';
-	 	$subtitle = 'subtitulo1';
-	 	$res = $this->oblog->edit_Blog($blog_id, $title, $subtitle);
-	 	$this->assertNull($res);
-	 	$this->assertTrue($this->oblog->edit_Blog($blog_id, $title, $subtitle)=== $res);
-		$this->assertFalse($res);
-	 }
-
-	 public function testDeleteBlog(){
-	 	$blog_id = 1;
-	 	$res = $this->oblog->delete_Blog($blog_id);
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse(is_array($res));
-	 }
-
-	 public function testCreatePost(){
-	 	global $_user, $_course;
-	 	$title = 'xxxxtestxxxx';
-	 	$full_text = 'xxxxx';
-	 	$file_comment = 'xxxxx';
-	 	$blog_id = 1;
-	 	$res = $this->oblog->create_post($title, $full_text, $file_comment, $blog_id);
-	 	$this->assertTrue($this->oblog->create_post($title, $full_text, $file_comment, $blog_id)=== null);
-	 	$this->assertNotNull(is_null,$res);
-	 	$this->assertFalse($res);
-
-	 }
-
-	 public function testEditPost(){
-	 	ob_start();
-	 	$post_id =3;
-	 	$title = 'xxTestxx';
-	 	$full_text = 'testing public function';
-	 	$Blog_id = 11;
-		$res = $this->oblog->edit_post(3,'xtestx','test',11);
-		ob_end_clean();
-		$this->assertNotNull($this->oblog->edit_post(3, 'xtestx','test',11)===null);
-		$this->assertFalse($res);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 public function testDeletePost(){
-	 	$Blog_id = 11;
-	 	$post_id = 21;
-	 	$res = $this->oblog->delete_post(11,21);
-	 	$this->assertTrue($this->oblog->delete_post(11,21)===null);
-	 	$this->assertNull(null,$res);
-	 	$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 public function testCreateComment(){
-	 	global $_user, $_course, $Blog_table_attachment;
-	 	$res = $this->oblog->create_comment('tesingBlog','xxxxxxx','xxx',12,1,null);
-	 	$this->assertNotNull($this->oblog->create_comment('tesingBlog','xxxxxxx','xxx',12,1,null)===null);
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse($res);
-	 }
-
-	 public function testDeleteComment(){
-	 	$res = $this->oblog->delete_comment(11,12,2);
-	 	$this->assertNotNull($this->oblog->delete_comment(11,12,2)===null);
-	 	$this->assertNull(null,$res);
-	 }
-
-	 public function testCreateTask(){
-		$res = $this->oblog->create_task(1,'xxx','xxxxxxx','xxxx','zzzzz','xxzz','blue');
-		$this->assertNotNull($this->oblog->create_task(1,'xxx','xxxxxxx','xxxx','zzzzz','xxzz','blue')=== null);
-		$this->assertTrue(is_null($res));
-		$this->assertFalse($res);
-		$this->assertFalse(null,$res);
-	 }
-
-	 public function testEditTask() {
-	 	$blog_id = 1;
-	 	$task_id = 2;
-	 	$title = 'xxxxxx';
-	 	$description = 'xx';
-	 	$articleDelete = 'aaa';
-	 	$articleEdit = 'axa';
-	 	$commentsDelete  = 'xax';
-	 	$color = 'red';
-	 	$res = $this->oblog->edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color);
-	 	//$res = Blog::edit_task();
-	 	$this->assertTrue($this->oblog->edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)===null);
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse(is_string($res));
-	 	$this->assertNull($res);
-	 }
-
-	 public function testDeleteTask(){
-	 	$blog_id = 1;
-	 	$task_id = 2;
-	 	$res = $this->oblog->delete_task($blog_id, $task_id);
-	 	$this->assertTrue($this->oblog->delete_task($blog_id, $task_id)===null);
-	 	$this->assertTrue(is_null($res));
-	 }
-
-	 public function testDeleteAssignedTask(){
-	 	$blog_id = 1;
-	 	$task_id = 2;
-	 	$user_id = 1;
-	 	$res = $this->oblog->delete_assigned_task($blog_id, $task_id,$user_id);
-	 	$this->assertTrue($this->oblog->delete_assigned_task($blog_id, $task_id,$user_id)===null);
-	 	$this->assertNotNull(is_null($res));
-	 	$this->assertFalse($res);
-	 }
-
-	 public function testGetPersonalTaskList(){
-	 	global $_user;
-	 	ob_start();
-	 	$res = Blog::get_personal_task_list('a');
-	 	$this->assertFalse($res);
-	 	ob_end_clean();
-	 }
-
-	 public function testChangeBlogVisibility(){
-	 	$blog_id = 1;
-	 	$res = $this->oblog->change_blog_visibility($blog_id);
-	 	$this->assertTrue($this->oblog->change_blog_visibility($blog_id)=== null);
-	 	$this->assertTrue(is_null($res));
-	 }
-
-	 public function testDisplayBlogPosts(){
-	 	ob_start();
-	 	$blog_id = 1;
-	 	$filter = '1=1';
-	 	$max_number_of_posts = 20;
-	 	$res = BLog::display_blog_posts($blog_id, $filter, $max_number_of_posts);
-	 	$this->assertTrue($this->oblog->display_blog_posts($blog_id, $filter, $max_number_of_posts)=== null);
-	 	ob_end_clean();
-	 	$this->assertNull($res);
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse(null, $res);
-	 }
-
-	 public function testDisplaySearchResults(){
-	 	ob_start();
-	 	$blog_id = 1;
-	 	$query_string = '"SELECT post.*, user.lastname, user.firstname FROM $tbl_blogs_posts"';
-	 	$res = $this->oblog->display_search_results($blog_id, $query_string);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		$this->assertNull($res);
-	 }
-
-	 public function testDisplayDayResults(){
-	 	ob_start();
-	 	$blog_id = 1;
-	 	$query_string = '01-01-2010';
-	 	$res = $this->oblog->display_day_results($blog_id, $query_string);
-	 	ob_end_clean();
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse($res);
-	 	$this->assertNull(null,$res);
-	 }
-
-	 public function testDisplayPost(){
-	 	ob_start();
-	 	$blog_id = 1;
-	 	$post_id = 2;
-	 	$res = $this->oblog->display_post($blog_id, $post_id);
-	 	ob_end_clean();
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse($res);
-	 }
-
-	 public function testAddRating(){
-	 	global $_user;
-	 	$res = $this->oblog->add_rating(null,11,2,5);
-	 	$this->assertFalse($this->oblog->add_rating(null,11,2,5)=== bool);
-	 	$this->assertTrue(is_bool($res));
-	 	$this->assertFalse(null,$res);
-	 }
-
-	 public function testDisplayRating(){
-	 	ob_start();
-	 	$res = $this->oblog->display_rating('xxx',11,1);
-	 	$this->assertFalse($this->oblog->display_rating('xxx',11,1)===null);
-	 	$this->assertTrue(is_numeric($res));
-	 	$this->assertFalse($res);
-	 	ob_end_clean();
-	 }
-
-	 public function testDisplayRatingForm(){
-	 	global $_user;
-	 	$res = $this->oblog->display_rating_form('xxx',11,1,null);
-	 	$this->assertFalse($this->oblog->display_rating_form('xxx',11,1,null)===null);
-	 	$this->assertTrue(is_string($res));
-	 	$this->assertNotNull($res,null);
-	 }
-
-	 public function testGetThreadedComments(){
-	 	ob_start();
-	 	$current = 0;
-	 	$current_level = 0;
-	 	$blog_id = 1;
-	 	$post_id = 2;
-	 	$task_id = 0;
-	 	global $charset, $dataFormatLong;
-	 	$res = $this->oblog->get_threaded_comments($current, $current_level, $blog_id, $post_id, $task_id);
-	 	ob_end_clean();
-	 	$this->assertFalse($res);
-	 	$this->assertTrue(is_null($res));
-	 }
-
-	 public function testDisplayFormNewPost(){
-	 	ob_start();
-	 	$blog_id = 1;
-	 	$res = Blog::display_form_new_post($blog_id);
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertNull($res);
-	 	ob_end_clean();
-	 }
-
-	 public function testDisplayFormEditPost(){
-	 	ob_start();
-	 	$blog_id = 1;
-	 	$post_id = 2;
-	 	$res = $this->oblog->display_form_edit_post($blog_id, $post_id);
-	 	$this->assertNotNull(is_null($res));
-	 	$this->assertFalse($res);
-	 	ob_end_clean();
-	 	//var_dump($res);
-	 }
-
-	 public function testDisplayTaskList(){
-	 	ob_start();
-	 	$res = $this->oblog->display_task_list(11);
-	 	$this->assertTrue($this->oblog->display_task_list(11)===null);
-	 	ob_end_clean();
-	 }
-
-	 public function testDisplayAssignedTaskList(){
-	 	ob_start();
-	 	global $charset, $color2;
-	 	$res = $this->oblog->display_assigned_task_list(11);
-	 	$this->assertTrue($this->oblog->display_assigned_task_list(11)===null);
-	 	ob_end_clean();
-	 	$this->assertFalse($res);
-
-	 }
-
-	 public function testDisplayNewTaskForm(){
-	 	ob_start();
-	 	$res = $this->oblog->display_new_task_form(11);
-	 	$this->assertTrue($this->oblog->display_new_task_form(11)===null);
-	 	ob_end_clean();
-	 	$this->assertFalse($res);
-
-
-	 }
-
-	 public function testDisplayEditTaskForm(){
-	 	ob_start();
-	 	$res = $this->oblog->display_edit_task_form(11,12);
-	 	$this->assertTrue($this->oblog->display_edit_task_form(11,12)===null);
-	 	ob_end_clean();
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse($res);
-
-	 }
-
-	 public function testDisplayAssignTaskForm(){
-	 	ob_start();
-	 	$res = $this->oblog->display_assign_task_form(11);
-	 	$this->assertTrue($this->oblog->display_assign_task_form(11)===null);
-	 	ob_end_clean();
-	 	$this->assertFalse($res);
-	 	$this->assertTrue(is_null($res));
-
-	 }
-
-	 public function testDisplayEditAssignedTaskForm(){
-	 	global $MonthsLong;
-	 	ob_start();
-	 	$res = $this-> oblog->display_edit_assigned_task_form(11,12,1);
-	 	$this->assertTrue($this->oblog->display_edit_assigned_task_form(11,12,1)===null);
-	 	ob_end_clean();
-	 	$this->assertFalse($res);
-
-	 }
-
-	 public function testAssignTask(){
-	 	ob_start();
-	 	$res = $this->oblog->assign_task(11,1,12,null);
-	 	$this->assertTrue($this->oblog->assign_task(11,1,12,null)===null);
-	 	ob_end_clean();
-	 	$this->assertFalse(is_numeric($res));
-	 	$this->assertNull(null,$res);
-
-	 }
-
-	 public function testEditAssignedTask(){
-	 	$task = array('blog_id'=>11,
-					  'user_id'=>1,
-                      'task_id'=>12,
-                      'target_date'=>'xxxxxxx',
-                 	  'old_user_id'=>10,
-                 	  'old_task_id'=>11,
-                 	  'old_target_date'=>'xxxzxxx'
-                 	 );
-        $res = $this->oblog->edit_assigned_task($task['blog_id'],$task['user_id'], $task['task_id'], $task['target_date'], $task['old_user_id'], $task['old_task_id'], $task['old_target_date']);
-        $this->assertNull($res);
-        $this->assertTrue(is_null($res));
-	 }
-
-	 public function testDisplaySelectTaskPost(){
-	 	ob_start();
-	 	$res = $this->oblog->display_select_task_post(11,12);
-	 	$this->assertTrue($this->oblog->display_select_task_post(11,12)===null);
-	 	ob_end_clean();
-	 	$this->assertTrue(is_null($res));
-	 	$this->assertFalse($res);
-
-     }
-
-	 public function testSetUserSubscribed(){
-	 	$res = $this->oblog->set_user_subscribed(11,12);
-	 	$this->assertTrue($this->oblog->set_user_subscribed(11,12)===null);
-	 	$this->assertFalse($res);
-	 	$this->assertTrue(is_null($res));
-     }
-
-	 public function testUserUnsubscribed(){
-	 	$res = $this->oblog->set_user_unsubscribed(11,12);
-	 	$this->assertTrue($this->oblog->set_user_unsubscribed(11,12)===null);
-	 	$this->assertFalse($res);
-	 	$this->assertTrue(is_null($res));
-	 }
-
-	 public function testDisplayFormUserSubscribe(){
-	 	ob_start();
-	 	$res = $this->oblog->display_form_user_subscribe(12);
-	 	$this->assertTrue($this->oblog->display_form_user_subscribe(12)===null);
-	 	ob_end_clean();
-	 	$this->assertNotNull(is_null($res));
-	 	$this->assertFalse($res);
-
-	}
-
-	/**
-	 * this function have been tested modified the function
-	 * display_form_user_unsubscribe in the blog.lib.php
-	 * main_table and course_table.
-	 *
-	 */
-
-    public function testDisplayFormUserUnsubscribe(){
-
-		global $_user;
-		ob_start();
-		$blog_id = '1';
-		$res = Blog::display_form_user_unsubscribe($blog_id);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		$this->assertNull($res);
-
-	}
-
-	public function testDisplayFormUserRights(){
-		ob_start();
-		$res = $this->oblog->display_form_user_rights(12);
-		$this->assertTrue($this->oblog->display_form_user_rights(12)===null);
-		ob_end_clean();
-		$this->assertFalse($res);
-
-	}
-
-	public function testDisplayNewCommentForm(){
-		$blog_id = '12';
-		$post_id='1';
-		$title='test';
-		ob_start();
-		$res =$this->oblog->display_new_comment_form($blog_id,$post_id,$title);
-		ob_end_clean();
-		$this->assertFalse($res);
-		$this->assertNotNull(is_null($res));
-
-	}
-
-	public function testDisplayMinimonthcalendar(){
-		global $_user,$DaysShort, $MonthsLong;
-		ob_start();
-		$month = 12;
-		$year = 2010;
-		$blog_id = 1;
-		$res = $this->oblog->display_minimonthcalendar($month, $year, $blog_id);
-		$this->assertTrue($this->oblog->display_minimonthcalendar($month, $year, $blog_id)=== null);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-
-	}
-
-	public function testDisplayNewBlogForm(){
-		ob_start();
-		$res = $this->oblog->display_new_blog_form();
-		$this->assertFalse($res);
-		$this->assertTrue(is_null($res));
-		$this->assertTrue($this->oblog->display_new_blog_form()===null);
-		ob_end_clean();
-	}
-
-	public function testDisplayEditBlogForm(){
-		ob_start();
-		$res = $this->oblog->display_edit_blog_form(12);
-		$this->assertTrue($this->oblog->display_edit_blog_form(12)===null);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-
-	}
-
-	public function testDisplayBlogList(){
-		ob_start();
-		$res = $this->oblog->display_blog_list();
-		$this->assertTrue($this->oblog->display_blog_list()===null);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-
-	}
-
-	public function testGetBlogAttachment(){
-		ob_start();
-		ob_end_clean();
-		global $_configuration;
-		$blog_id = '0';
-		$post_id = null;
-		$comment_id = null;
-		$res = get_blog_attachment($blog_id, $post_id,$comment_id);
-		$this->assertFalse($res);
-		$this->assertTrue(is_array($res));
-	}
-
-	public function testDeleteAllBlogAttachment(){
-		global $_course,$_configuration;
-		$blog_id = 1;
-		$post_id=null;
-		$comment_id=null;
-		$res = delete_all_blog_attachment($blog_id,$post_id,$comment_id);
-		$this->assertFalse($res);
-		$this->assertNull($res);
-	}
-
-	public function testGetBlogPostFromUser(){
-		global $_configuration;
-		$res = get_blog_post_from_user('chamilo_COURSETEST',1);
-		$this->assertFalse($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testGetBlogCommentFromUser(){
-		global $_configuration;
-		$course_datos['wanted_code'] = 'chamilo_COURSETEST';
-		$user_id = 1;
-		$res = get_blog_comment_from_user($course_datos['wanted_code'],1);
-		$this->assertFalse($res);
-		$this->assertTrue(is_string($res));
-		$path = api_get_path(SYS_PATH).'archive';
-		if ($handle = opendir($path)) {
-			while (false !== ($file = readdir($handle))) {
-				if (strpos($file,'COURSETEST')!==false) {
-					if (is_dir($path.'/'.$file)) {
-						rmdirr($path.'/'.$file);
-					}
-				}
-			}
-		closedir($handle);
-		}
-	}
-/*
-	public function testDeleteCourse() {
-		global $cidReq;
-		$resu = CourseManager::delete_course($cidReq);
-	}
-
-	*/
-
-
-
-
-
-}
-?>
diff --git a/tests/main/inc/lib/database.lib.test.php b/tests/main/inc/lib/database.lib.test.php
deleted file mode 100755
index 2a46801f62..0000000000
--- a/tests/main/inc/lib/database.lib.test.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'database.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'add_course.lib.inc.php');
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
-class TestDatabase extends UnitTestCase {
-
-	 public $dbase;
-	 public function TestDatabase() {
-	 	$this->UnitTestCase('Database library - main/inc/lib/database.lib.test.php');
-	 }
-
-	 public function setUp() {
-	 	global $_configuration;
- 	 	$this->dbase = new Database();
-	 }
-
-	 public function tearDown() {
-	 	$this->dbase = null;
-	 }
-
-	public function testAffectedRows() {
-		$res=$this->dbase->affected_rows();
-		$this->assertTrue(is_numeric($res));
-	}
-
-	public function testCountRows() {
-		$table='class';
-		$res=$this->dbase->count_rows($table);
-		if(!is_string($res)){
-			$this->assertTrue(is_numeric($res));
-		}
-	}
-
-	public function testError() {
-		$res=$this->dbase->error();
-		$this->assertTrue(is_string($res));
-	}
-
-	public function testEscapeString() {
-		$string='Lore"May';
-		$res=$this->dbase->escape_string($string);
-		$this->assertTrue(is_string($res));
-	}
-
-	public function testFetchArray() {
-		$sql = 'select 1';
-		$res=Database::query($sql);
-		$resu=$this->dbase->fetch_array($res);
-		$this->assertTrue(is_array($resu));
-		$this->assertFalse(is_null($resu));
-	}
-
-	public function testFetchArrayError() {
-		$sql = 'SELECT  1';
-		$res=Database::query($sql);
-		$resu=$this->dbase->fetch_array($res);
-		$this->assertTrue(is_array($resu));
-	}
-
-	function testFetchObject() {
-		$sql = 'SELECT  1';
-		$res=Database::query($sql);
-		$resu=$this->dbase->fetch_object($res);
-		$this->assertTrue(is_object($resu));
-	}
-
-	function testFetchRow() {
-		$sql = 'SELECT  1';
-		$res=Database::query($sql);
-		$resu=$this->dbase->fetch_row($res);
-		$this->assertTrue(is_array($resu));
-	}
-
-	/* // Contains a private unaccessible method, Database::fix_database_parameter().
-	function testFixDatabaseParameterReturnString() {
-		$course_info = api_get_course_info();
-		$database_name= $course_info["dbName"];
-		$res=$this->dbase->fix_database_parameter($course_info);
-		$this->assertTrue(is_string($res));
-	}
-	*/
-
-	/* // Contains a private unaccessible method, Database::format_glued_course_table_name().
-	function testFormatGluedCourseTableName()  {
-		$database_name_with_glue='';
-		$table='';
-		$res=$this->dbase->format_glued_course_table_name($database_name_with_glue, $table);
-		$this->assertTrue(is_string($res));
-	}
-	*/
-
-	/* // Contains a private unaccessible method, Database::format_table_name().
-	function testFormatTableName() {
-		$database='';
-		$table='';
-		$res=$this->dbase->format_table_name($database, $table);
-		$this->assertTrue(is_string($res));
-	}
-	*/
-
-	function testGetCourseInfo() {
-		$course_code='AYDD';
-		$res=$this->dbase->get_course_info($course_code);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetCourseList() {
-		$sql_query = "SELECT * FROM $table";
-		$res=$this->dbase->get_course_list($sql_query);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetCourseTable() {
-		$short_table_name='';
-		$database_name='';
-		$res=$this->dbase->get_course_table($short_table_name,$database_name);
-		$this->assertTrue(is_string($res));
-	}
-
-	function testGetMainDatabase() {
-		global $_configuration;
-		$res=$this->dbase->get_main_database();
-		$this->assertTrue(is_string($res));
-	}
-
-	function testGetMainTable() {
-		$short_table_name='';
-		$res=$this->dbase->get_main_table($short_table_name);
-		$this->assertTrue(is_string($res));
-	}
-
-	/* // Contains a private unaccessible method, Database::glue_course_database_name().
-	function testGlueCourseDatabaseName() {
-		$database_name='';
-		$res=$this->dbase->glue_course_database_name($database_name);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res);
-	}
-	*/
-
-	function testInsertId() {
-		$res = $this->dbase->insert_id();
-		$this->assertTrue(is_numeric($res));
-	}
-
-	function testNumRows() {
-		$sql = 'SELECT * FROM user';
-		$res = Database::query($sql);
-		$resul=Database::num_rows($res);
-		$this->assertTrue(is_numeric($resul));
-	}
-
-	function testQuery() {
-		$sql = 'SELECT 1';
-		$res = Database::query($sql);
-		$this->assertTrue(is_resource($res));
-	}
-
-	function testResult() {
-		$sql = 'SELECT email FROM user';
-		$resource = Database::query($sql);
-		$res = Database::result($resource, 1);
-		$this->assertTrue(is_string($res));
-	}
-
-	function testStoreResult(){
-		$sql = 'SELECT 1';
-		$resource = $this->dbase->query($sql);
-		$res = $this->dbase->store_result($resource);
-		$this->assertTrue(is_array($res));
-	}
-}
-?>
diff --git a/tests/main/inc/lib/debug.lib.inc.test.php b/tests/main/inc/lib/debug.lib.inc.test.php
deleted file mode 100755
index 6632f87d30..0000000000
--- a/tests/main/inc/lib/debug.lib.inc.test.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'debug.lib.php');
-
-
-class TestDebug extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Debug helper library - main/inc/lib/debug.lib.inc.test.php');
-    }
-	function test_printr_is_string() {
-		$variable='br';
-		ob_start();
-		Debug::printr($variable);
-		$res=ob_get_contents();
-		ob_end_clean();
-		//print_r($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(is_scalar($res));
-	}
-
-	function test_debug_course_is_string() {
-		global $_course;
-		ob_start();
-		Debug::course($_course);
-		$res=ob_get_contents();
-		ob_end_clean();
-		//print_r($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-
-	}
-
-	function test_debug_paths_is_string() {
-		ob_start();
-		Debug::debug_paths();
-		$res=ob_get_contents();
-		ob_end_clean();
-		//print_r($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(is_scalar($res));
-	}
-
-	function test_debug_user_is_array() {
-		global $_user;
-		ob_start();
-		Debug::user($_user);
-		$res=ob_get_contents();
-		ob_end_clean();
-		//print_r($res);
-		$this->assertTrue(array($_user));
-		//var_dump($res);
-	}
-
-	function test_print_var_is_string() {
-		$var='';
-		GLOBAL $DEBUG;
-		ob_start();
-		Debug::print_var($var, $varName = "@");
-		$res=ob_get_contents();
-		ob_end_clean();
-		//print_r($res);
-		$this->assertTrue(is_string($res));
-	}
-}
-?>
diff --git a/tests/main/inc/lib/display.lib.test.php b/tests/main/inc/lib/display.lib.test.php
deleted file mode 100755
index 1738d155f6..0000000000
--- a/tests/main/inc/lib/display.lib.test.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'display.lib.php');
-
-class TestDisplay extends UnitTestCase {
-    public function __construct(){
-        $this->UnitTestCase('Display library - main/inc/display.lib.test.php');
-    }
-	public function testdisplay_introduction_section() {
-		$tool=api_get_tools_lists($my_tool=null);
-		ob_start();
-		$res = Display::display_introduction_section($tool);
-		ob_end_clean();
-		$this->assertTrue(is_array($tool));
-		//var_dump($tool);
-	}
-
-	public function testdisplay_localised_html_file(){
-		global $language_interface;
-		$doc_url = str_replace('/..', '', $doc_url);
-		$full_file_name=api_get_path(SYS_COURSE_PATH).'/index'.$doc_url;
-		ob_start();
-		$res = Display::display_localised_html_file($full_file_name);
-		ob_end_clean();
-		$this->assertTrue(is_string($full_file_name));
-		//var_dump($full_file_name);
-	}
-
-	public function testdisplay_sortable_table() {
-		$header='';
-		$content='';
-		global $origin;
-		ob_start();
-		$res=Display::display_sortable_table($header, $content);
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-		/**
-	 * Display a table with a special configuration
-	 * @param array $header Titles for the table header
-	 * 						each item in this array can contain 3 values
-	 * 						- 1st element: the column title
-	 * 						- 2nd element: true or false (column sortable?)
-	 * 						- 3th element: additional attributes for
-	 *  						th-tag (eg for column-width)
-	 * 						- 4the element: additional attributes for the td-tags
-	 * @param array $content 2D-array with the tables content
-	 * @return void String about header
-	 */
-	public function testdisplay_sortable_config_table() {
-		$header='';
-		$content='';
-		global $origin;
-		ob_start();
-		$res=Display::display_sortable_config_table($header, $content);
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-		/**
-	* Displays a normal message. It is recommended to use this public function
-	* to display any normal information messages.
-	*
-	* @param string $message - include any additional html
-	*                          tags if you need them
-	* @param bool	Filter (true) or not (false)
-	* @return void String message
-	*/
-	public function testdisplay_normal_message() {
-		global $charset;
-		$message=api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : $charset);
-		ob_start();
-		$res=Display::display_normal_message($message);
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	/**
-	 * Display the reduced page header (without banner)
-	 */
-	// [/var/www/chamilo/main/inc/reduced_header.inc.php line 30] - exception
-/*	public function testdisplay_reduced_header() {
-		global $_plugins,$lp_theme_css,$mycoursetheme,$user_theme,$platform_theme;
-		global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF, $language_interface;
-		global $menu_navigation;
-		ob_start();
-		$res=Display::display_reduced_header();
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-*/
-	/**
-	* Displays an confirmation message. Use this if something has been done successfully
-	*
-	* @param string $message
-	* @param bool	Filter (true) or not (false)
-	* @return void String message
-	*/
-	public function testdisplay_confirmation_message() {
-		global $charset;
-		$message=api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : $charset);
-		ob_start();
-		$res=Display::display_confirmation_message($message);
-		ob_end_clean();
-		$this->assertTrue(is_string($message));
-		//var_dump($message);
-	}
-
-	/**
-	* Displays an error message.
-	* @author Arthur Portugal
-	* @param string $message - include any additional html tags if you need them
-	* @param bool	Filter (true) or not (false)
-	* @param object Not display the object in the test browser
-	* @return string Code HTML
-	*/
-	public function testdisplay_error_message() {
-		global $charset;
-		$message = "error message";
-		ob_start();
-		$res=Display::display_error_message($message);
-		ob_end_clean();
-		$this->assertTrue(is_string($message));
-		//var_dump($message);
-	}
-
-	/**
-	 * Display the page footer
-	 * @author Arthur Portugal
-	 * @return string Code HTML about the footer
-	 */
-/*	public function testdisplay_footer() {
-		global $_plugins;
-		ob_start();
-		$res=Display::display_footer();
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-*/
-	/**
-	 * Display the page header
-	 * @param string The name of the page (will be showed in the page title)
-	 * @param string Optional help file name
-	 * @return string Display the hearders messages
-	 */
-	// [/var/www/chamilo/main/inc/header.inc.php line 31] - exception
-/*	public function testdisplay_header() {
-		global $_plugins,$lp_theme_css,$mycoursetheme,$user_theme,$platform_theme;
-		global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF;
-		global $menu_navigation;
-		$tool_name = '';
-		$help = NULL;
-		$nameTools = $tool_name;
-		ob_start();
-		$res=Display::display_header($tool_name, $help);
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-*/
-	/**
-	 * This public function displays an icon
-	 * @param string $image the filename of the file (in the main/img/ folder
-	 * @param string $alt_text the alt text (probably a language variable)
-	 * @param array additional attributes (for instance height, width, onclick, ...)
-	 * @return return icon like string in this test (path)
-	*/
-	public function testdisplay_icon() {
-		$image='file';
-		ob_start();
-		$res=Display::display_icon($image);
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	/**
-	* Displays an warning message. Use this if you want to draw attention to something
-	*
-	* @author Arthur Portugal
-	* @param string $message
-	* @param bool	Filter (true) or not (false)
-	* @return string with the message (also void)
-	*/
-	public function testdisplay_warning_message() {
-		$message="warning-message";
-		ob_start();
-		$res=Display::display_warning_message($message);
-		ob_end_clean();
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	/**
-	 * Return an encrypted mailto hyperlink
-	 * @author Arthur Portugal
-	 * @param - $email (string) - e-mail
-	 * @return - encrypted mailto hyperlink
-	 */
-	public function testencrypted_mailto_link() {
-		$email='';
-		$clickable_text = null;
-		$style_class = '';
-		ob_start();
-		$res=Display::encrypted_mailto_link($email, $clickable_text, $style_class);
-		ob_end_clean();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Print an <option>-list with all letters (A-Z).
-	 * @param char $selected_letter The letter that should be selected
-	 */
-	public function testget_alphabet_options() {
-		$selected_letter = 5;
-		ob_start();
-		$res=Display::get_alphabet_options();
-		ob_end_clean();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testget_numeric_options() {
-		$min='';
-		$max='';
-		ob_start();
-		$res=Display::get_numeric_options($min,$max);
-		ob_end_clean();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * This public function returns the htmlcode for an icon
-	 *
-	 * @param string $image the filename of the file (in the main/img/ folder
-	 * @param string $alt_text the alt text (probably a language variable)
-	 * @param array additional attributes (for instance height, width, onclick, ...)
-	 *
-     */
-	public function testreturn_icon() {
-		$image='';
-		ob_start();
-		$res=Display::return_icon($image);
-		ob_end_clean();
-		//$res=ob_get_contents();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-}
diff --git a/tests/main/inc/lib/document.lib.test.php b/tests/main/inc/lib/document.lib.test.php
deleted file mode 100755
index 5015256aae..0000000000
--- a/tests/main/inc/lib/document.lib.test.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
-
-class TestDocumentManager extends UnitTestCase {
-
-
-    public function __construct() {
-        $this->UnitTestCase('Document Manager library - main/inc/lib/document.lib.test.php');
-    }
-
-    /**
-	 * This checks if a document has the readonly property checked, then see if
-	 * the user is the owner of this file, if all this is true then return true.
-	 *
-	 * @param array  $_course
-	 * @param int    $user_id id of the current user
-	 * @param string $file path stored in the database
-	 * @param int    $document_id in case you dont have the file path ,insert the
-	 * id of the file here and leave $file in blank ''
-	 * @return boolean true/false
-	 **/
-	public function testcheck_readonly() {
-		global $user_id, $_course;
-		$file='';
-		$res=DocumentManager::check_readonly($_course,$user_id,$file);
-		$this->assertTrue(is_bool($res));
-	}
-
-	/**
-	 * This deletes a document by changing visibility to 2, renaming it to
-	 * filename_DELETED_#id
-	 * Files/folders that are inside a deleted folder get visibility 2
-	 *
-	 * @param array $_course
-	 * @param string $path, path stored in the database
-	 * @param string ,$base_work_dir, path to the documents folder
-	 * @return boolean true/false
-	 * @todo now only files/folders in a folder get visibility 2, we should
-	 * rename them too.
-	 */
-	function testdelete_document() {
-		global $_course;
-		$path='';
-		$base_work_dir='';
-		ob_start();
-		$res=DocumentManager::delete_document($_course, $path, $base_work_dir);
-		ob_end_clean();
-		$this->assertTrue(is_bool($res));
-	}
-
-	/**
-	 * Removes documents from search engine database
-	 *
-	 * @param string $course_id Course code
-	 * @param int $document_id Document id to delete
-	 * @return void
-	 */
-	function testdelete_document_from_search_engine() {
-		global $cidReq;
-		$course_id = $cidReq;
-		$document_id='';
-		$res=DocumentManager::delete_document_from_search_engine($course_id, $document_id);
-		$this->assertNull($res);
-	}
-
-	/**
-	*	Get the content type of a file by checking the extension
-	*	We could use mime_content_type() with php-versions > 4.3,
-	*	but this doesn't work as it should on Windows installations
-	*
-	*	@param string $filename or boolean TRUE to return complete array
-	*
-	*/
-	function testfile_get_mime_type() {
-		$filename='';
-		$res=DocumentManager::file_get_mime_type($filename);
-		$this->assertTrue(is_string($res));
-	}
-
-	/**
-	* This function streams a file to the client
-	*
-	* @param string $full_file_name
-	* @param boolean $forced
-	* @param string $name
-	* @return false if file doesn't exist, true if stream succeeded
-	*/
-	function testfile_send_for_download() {
-		$full_file_name='';
-		$forced = false;
-		$name = '';
-		$res=DocumentManager::file_send_for_download($full_file_name, $forced, $name);
-		$this->assertTrue(is_bool($res));
-	}
-
-	/**
-	*   @todo ??not only check if a file is visible, but also check if the user
-	* 	is allowed to see the file??
-	*   @return true if the user is allowed to see the document, false otherwise
-	* 	(bool)
-	*/
-/*	function testfile_visible_to_user() {
-		global $_course,$tbl_document;
-		$tbl_document = Database::get_course_table(TABLE_DOCUMENT);
-		$this_course= $_course['dbName'].'.';
-		$dirurl = api_get_path(WEB_COURSE_PATH);
-		$doc_url= $dirurl.'COURSETEST/document/video/painting.mpg?cidReq=COURSETEST';
-		$res=DocumentManager::file_visible_to_user($this_course, $doc_url);
-		$this->assertTrue(is_bool($res));
-	}
-*/
-	/**
-	* Fetches all document data for the given user/group
-	*
-	* @param array $_course
-	* @param string $path
-	* @param int $to_group_id
-	* @param int $to_user_id
-	* @param boolean $can_see_invisible
-	* @return array with all document data
-	*/
-	function testget_all_document_data() {
-		global $_course;
-		$path = '/';
-		$to_group_id = 0;
-		$to_user_id = NULL;
-		$can_see_invisible = false;
-		$res=DocumentManager::get_all_document_data($_course, $path,
-		$to_group_id, $to_user_id, $can_see_invisible);
-		if (empty($_course['dbName'])) {
-            $this->assertFalse($res);
-		} else {
-			$this->assertTrue(is_array($res));
-		}
-	}
-
-	/**
-	 * Gets the paths of all folders in a course
-	 * can show all folders (exept for the deleted ones) or only visible ones
-	 * @param array $_course
-	 * @param boolean $can_see_invisible
-	 * @param int $to_group_id
-	 * @return array with paths
-	 */
-	function testget_all_document_folders() {
-		global $_course;
-		$to_group_id = '0';
-		$can_see_invisible = false;
-		$res = DocumentManager::get_all_document_folders($_course, $to_group_id, $can_see_invisible);
-        if (empty($_course['dbName'])) {
-            $this->assertFalse($res);
-        } else {
-            $this->assertTrue(is_array($res));
-        }
-	}
-
-	/**
-	* @return the document folder quota of the current course, in bytes
-	*/
-	/* Removed temporarily, causing problems for some reason on automated tests
-	 * server
-	function testget_course_quota() {
-		global $_course, $maxFilledSpace;
-		$res = DocumentManager::get_course_quota();
-		$this->assertTrue(is_string($res));
-	}
-*/
-	/** Gets the id of a document with a given path
-	 *
-	 * @param array $_course
-	 * @param string $path
-	 * @return int id of document / false if no doc found
-	 */
-	function testget_document_id() {
-		global $_course;
-		$path = Database::escape_string($path);
-		$res=DocumentManager::get_document_id($_course, $path);
-		$this->assertTrue(is_bool($res));
-	}
-
-	/** This check if a document is a folder or not
-	 * @param array  $_course
-	 * @param int    $document_id of the item
-	 * @return boolean true/false
-	 **/
-	function testis_folder() {
-		global $_course;
-		$document_id = 1;
-		$res=DocumentManager::is_folder($_course, $document_id);
-		$this->assertTrue(is_bool($res));
-	}
-
-	/**
-	 * return true if the documentpath have visibility=1 as item_property
-	 *
-	 * @param string $document_path the relative complete path of the document
-     * @param array  $course the _course array info of the document's course
-	 */
-	function testis_visible() {
-		global $_course;
-		$doc_path = Database::escape_string($doc_path);
-		$res=DocumentManager::is_visible($doc_path, $_course);
-		$this->assertTrue(is_bool($res));
-	}
-
-	/**
-	 * Allow to set a specific document as a new template for FCKEditor for a
-	 * particular user in a particular course
-	 *
-	 * @param string $title
-	 * @param string $description
-	 * @param int $document_id_for_template the document id
-	 * @param string $couse_code
-	 * @param int $user_id
-	 */
-	function testset_document_as_template() {
-		global $_course,$_user;
-		$title='test';
-		$description='test';
-		$document_id_for_template='';
-		$couse_code=$_course;
-		$user_id=$_user;
-		$image='';
-		$res=DocumentManager::set_document_as_template($title, $description,
-													   $document_id_for_template,
-													   $couse_code, $user_id,
-													   $image
-													  );
-		$this->assertTrue(is_bool($res));
-	}
-    function testdocuments_total_space() {
-        $to_group_id='0';
-        $res= DocumentManager::documents_total_space($to_group_id);
-        if(!is_null($res)):
-        $this->assertTrue(is_numeric($res));
-        endif;
-    }
-
-    function testenough_space() {
-        $file_size='';
-        $max_dir_space='';
-        $res= DocumentManager::enough_space($file_size, $max_dir_space);
-        $this->assertTrue(is_bool($res));
-    }
-
-    
- //The following function throws exceptions because of SimpleTest, because
- // it declares uncapturable headers
-/*	function teststring_send_for_download() {
-		$full_string='';
-		$forced = false;
-		$name = '';
-		$filename = $name;
-		$len = strlen($full_string);
-		if (!headers_sent()) {
-			$res=DocumentManager::string_send_for_download($full_string, $forced, $name);
-		}
-		$this->assertTrue(empty($res));
-	}
-*/
-	/**
-	 * Unset a document as template
-	 *
-	 * @param int $document_id
-	 * @param string $couse_code
-	 * @param int $user_id
-	 * @return void null
-	 */
-	function testunset_document_as_template() {
-		$document_id=Database::escape_string($document_id);
-		$course_code=Database::escape_string($course_code);
-		$user_id=Database::escape_string($user_id);
-		$res=DocumentManager::unset_document_as_template($document_id,
-														 $course_code,
-														 $user_id
-														);
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-	/*
-	public function testdeleteCourseInDocument(){
-		$this->dmanager = null;
-		global $_course;
-	 	$code = $_course;
-		$res = CourseManager::delete_course($code);
-		$path = api_get_path(SYS_PATH).'archive';
-		if ($handle = opendir($path)) {
-			while (false !== ($file = readdir($handle))) {
-				if (strpos($file,$code)!==false) {
-					if (is_dir($path.'/'.$file)) {
-						rmdirr($path.'/'.$file);
-					}
-				}
-			}
-			closedir($handle);
-		}
-
-	}*/
-}
-?>
diff --git a/tests/main/inc/lib/events.lib.inc.test.php b/tests/main/inc/lib/events.lib.inc.test.php
deleted file mode 100755
index 887d7efdf4..0000000000
--- a/tests/main/inc/lib/events.lib.inc.test.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
-
-class TestEvents extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('Events library - main/inc/events.lib.inc.test.php');
-    }
-
-	function testCreateEventExerciceEmptyExoId() {
-		/*global $_user, $_cid, $_configuration;
-		$exo_id='';
-		$res=create_event_exercice($exo_id);
-		$this->assertFalse($res);*/
-		//var_dump($res);
-	}
-
-    function testCreateEventExerciceUnexistingExoId() {
-        global $_user, $_cid, $_configuration;
-        $exo_id=3589534; //unexisting exe ID
-        $res=create_event_exercice($exo_id);
-        $this->assertFalse($res);
-        //var_dump($res);
-    }
-
-	function testEventAccessCourse() {
-		global $_configuration;
-		global $_user;
-		global $_cid;
-		global $TABLETRACK_ACCESS;
-		global $TABLETRACK_LASTACCESS;
-		$res=Event::accessCourse();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testEventAccessTool() {
-		global $_configuration;
-		global $_cid;
-		global $TABLETRACK_ACCESS;
-		global $_configuration;
-		global $_course;
-		global $TABLETRACK_LASTACCESS;
-		$tool = '';
-		$id_session = 0;
-		$res=Event::event_access_tool($tool, $id_session);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testEventDownload() {
-		global $_configuration;
-		global $_user;
-		global $_cid;
-		global $TABLETRACK_DOWNLOADS;
-		$doc_url= '';
-		$res=Event::event_download($doc_url);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testEventLink() {
-		global $_configuration;
-		global $_user;
-		global $_cid;
-		global $TABLETRACK_LINKS;
-		$link_id='';
-		$res=Event::event_link($link_id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testEventLogin() {
-		global $_configuration;
-		global $_user;
-		global $TABLETRACK_LOGIN;
-		$res=Event::event_login(1);
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	function testEventOpen() {
-		global $_configuration;
-		global $TABLETRACK_OPEN;
-		$res=event_open();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testEventSystem() {
-		global $_configuration;
-		global $_user;
-		global $TABLETRACK_DEFAULT;
-		$event_type = 'bla';
-		$event_value_type = 'blo';
-		$event_value = 'bli';
-		$res=Event::addEvent($event_type, $event_value_type, $event_value);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-
-	function testEventUpload() {
-		global $_configuration;
-		global $_user;
-		global $_cid;
-		global $TABLETRACK_UPLOADS;
-		$doc_id='';
-		$res=Event::event_upload($doc_id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testExerciseAttempt() {
-		$score = Database::escape_string($score);
-		$answer = Database::escape_string($answer);
-		$quesId = Database::escape_string($quesId);
-		$exeId = Database::escape_string($exeId);
-		$j = Database::escape_string($j);
-		global $_configuration, $_user, $_cid;
-		$res=Event::exercise_attempt($score,$answer,$quesId,$exeId,$j);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testExerciseAttemptHotspot() {
-		global $_configuration, $_user, $_cid;
-		$exe_id='';
-		$question_id='';
-		$answer_id='';
-		$correct='';
-		$coords='';
-		$res=Event::exercise_attempt_hotspot($exe_id, $question_id, $answer_id, $correct, $coords);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testUpdateEventExercice() {
-		$exeid='';
-		$exo_id='';
-		$score='';
-		$weighting='';
-		$session_id='';
-		$duration='';
-		$question_list = array();
-		$res=Event::update_event_exercise($exeid,$exo_id, $score, $weighting,$session_id,$learnpath_id=0,$learnpath_item_id=0, $duration, $question_list);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-}
diff --git a/tests/main/inc/lib/exercise_show_functions.lib.test.php b/tests/main/inc/lib/exercise_show_functions.lib.test.php
deleted file mode 100755
index 5ad4f9d2e5..0000000000
--- a/tests/main/inc/lib/exercise_show_functions.lib.test.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-class TestExerciseShowFunctions extends UnitTestCase {
-	
-	/**
-	 * Shows the answer to a fill-in-the-blanks question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	
-	function testdisplay_fill_in_blanks_answer() {
-		$answer= 'test';
-		$id=1;
-		$questionId=1;
-		ob_start();
-		$res = ExerciseShowFunctions::display_fill_in_blanks_answer($answer,$id,$questionId);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * Shows the answer to a free-answer question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	 
-	function testdisplay_free_answer() {
-		$answer= 'test';
-		$id=1;
-		$questionId=1;
-		ob_start();
-		$res = ExerciseShowFunctions::display_free_answer($answer,$id,$questionId);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * Displays the answer to a hotspot question
-	 * @param int $answerId
-	 * @param string $answer
-	 * @param string $studentChoice
-	 * @param string $answerComment
-	 * @return void
-	 */
-	 
-	 function testdisplay_hotspot_answer() {
-	 	$answerId = 1;
-		$answer= 'testanswer';
-		$studentChoice='testchoise';
-		$answerComment='testcomment';
-		ob_start();
-		$res = ExerciseShowFunctions::display_hotspot_answer($answerId, $answer, $studentChoice, $answerComment);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * Display the answers to a multiple choice question
-	 * @param integer Answer type
-	 * @param integer Student choice
-	 * @param string  Textual answer
-	 * @param string  Comment on answer
-	 * @param string  Correct answer comment
-	 * @param integer Exercise ID
-	 * @param integer Question ID
-	 * @param boolean Whether to show the answer comment or not
-	 * @return void
- 	 */
- 	 
-	 function testdisplay_unique_or_multiple_answer() {
-	 	global $feedback_type, $_course;
-	 	$answerType = 1;
-		$studentChoice='testchoise';
-		$answer= 'testanswer';
-		$answerComment='testcomment';
-		$answerCorrect='testcorrect';
-		$id = 1;
-		$questionId = 1;
-		$ans=true;
-		ob_start();
-		$res = ExerciseShowFunctions::display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect, $id, $questionId, $ans);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	
-	/**
-	 * This function gets the comments of an exercise
-	 *
-	 * @param int $id
-	 * @param int $question_id
-	 * @return str the comment
-	 */
-	 
-	 function testget_comments() {
-		$id = 1;
-		$question_id = 1;
-		ob_start();
-		$res = ExerciseShowFunctions::get_comments($id,$question_id);
-		ob_end_clean();
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	} 
-	
-	 function testsend_notification() {
-		$arrques = 'test';
-		$arrans = 'test';
-		$to = 'test';
-		$res = ExerciseShowFunctions::send_notification($arrques, $arrans, $to);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	} 	
-}
-?>
diff --git a/tests/main/inc/lib/export.lib.inc.test.php b/tests/main/inc/lib/export.lib.inc.test.php
deleted file mode 100755
index 37de632b1f..0000000000
--- a/tests/main/inc/lib/export.lib.inc.test.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'export.lib.inc.php');
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
-
-/** Test about export csv using class document manager
- * @author Arthur portugal
- * To can test and show the var_dump is necesary comment inside the class
- * DocumentManager in the file document.lib.php the word "exit()", because
- * "exit" not permit show the result.
- */
-class TestExport extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Export library - main/inc/lib/export.lib.inc.test.php');
-    }
-
-    /**
-     * Checks the arrayToCsv method.
-     * @todo check that a new file is created in api_get_path(SYS_ARCHIVE_PATH)
-     */
-    function testArrayToCsv() {
-        $data = array();
-        // can only be tested if headers were not sent
-        ob_start();
-       	$res = Export::arrayToCsv($data, $filename = 'export');
-		$this->assertFalse($res);
-		ob_end_clean();
-    }
-
-
- 	function testExportTableXls() {
-		$data = array();
-		$filename = 'export';
-        ob_start();
-		$res=Export::arrayToXls($data,$filename);
-		$this->assertFalse($res);
-        ob_end_clean();
- 	}
-
- 	function testExportTableXml() {
-		$data = array();
-		$filename = 'export';
-		$item_tagname = 'item';
-		$wrapper_tagname = null;
-		$encoding=null;
-        ob_start();
-		$res=Export::arrayToXml($data,$filename,$item_tagname,
-									  $wrapper_tagname,$encoding);
-        $this->assertFalse($res);
-        ob_end_clean();
- 	}
-
- 	function testExportComplexTableXml() {
-		$data = array();
-		$filename = 'export';
-		$wrapper_tagname=null;
- 		$encoding='ISO-8859-1';
-        ob_start();
- 		$res=Export::export_complex_table_xml($data,$filename,
-	 		                                        $wrapper_tagname,$encoding);
-        $this->assertFalse($res);
-        ob_end_clean();
- 	}
-
-  	function testExportComplexTableXmlHelper() {
-  		$data = array();
-		$level=1;
-        ob_start();
-		$res=Export::_export_complex_table_xml_helper($data,$level);
-        $this->assertTrue(is_string($res));
-        ob_end_clean();
-  	}
-}
diff --git a/tests/main/inc/lib/fileDisplay.lib.test.php b/tests/main/inc/lib/fileDisplay.lib.test.php
deleted file mode 100755
index 055242f3a5..0000000000
--- a/tests/main/inc/lib/fileDisplay.lib.test.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-class TestFileDisplay extends UnitTestCase {
-
-	public function TestFileDisplay(){
-		$this->UnitTestCase('File display library - main/inc/lib/fileDisplay.lib.test.php');
-	}
-	//todo public function testArraySearch()
-	//todo public function testChooseImage()
-	//todo public function testFormatFileSize()
-	//todo public function testFormatDate()
-	//todo public function testFormatUrl()
-	//todo public function testRecentModifiedFileTime()
-	//todo public function testFolderSize()
-	//todo public function testGetTotalFolderSize()
-
-	public function testChooseImage(){
-		global $_course;
-
-		static $type, $image;
-		$file_name = '';
-		$res = choose_image($file_name);
-		$this->assertEqual($res,'defaut.gif');
-		$this->assertTrue(is_string($res));
-		//var_dump($file_name);
-	}
-
-	public function testFormatFileSize(){
-		$file_size = '100';
-		$res = format_file_size($file_size);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-
-	}
-
-	public function testFormatDate(){
-		$date = '11/02/2009';
-		$res = format_date($date);
-		$this->assertTrue($res);
-		//var_dump($res);
-
-	}
-
-	public function testFormatUrl(){
-		$file_path ='/var/www/path/';
-		$res = format_url($file_path);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-
-	}
-
-	public function testRecentModifiedFileTime(){
-		$dir_name = '';
-		$$do_recursive =true;
-		$res = recent_modified_file_time($dir_name, $do_recursive);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-
-	}
-
-	public function testFolderSize(){
-		$dir_name ='';
-		$res = folder_size($dir_name);
-		$this->assertFalse($res);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-
-
-	}
-
-}
-
-
-?>
diff --git a/tests/main/inc/lib/fileManage.lib.test.php b/tests/main/inc/lib/fileManage.lib.test.php
deleted file mode 100755
index ff27146407..0000000000
--- a/tests/main/inc/lib/fileManage.lib.test.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-class TestFileManager extends UnitTestCase {
-
-	public $fmanager;
-	public function TestFileManager(){
-		$this->UnitTestCase ('File Manager library - main/inc/lib/fileManage.lib.test.php');
-	}
-
-	public function setUp(){
-		$this->fmanager = new FileManager();
-	}
-
-	public function tearDown(){
-		$this->fmanager = null;
-	}
-
-	//todo public function testUpdatedbInfo
-	//todo public function testCheckNameExist
-	//todo public function testMyDelete
-	//todo public function testRemoveDir
-	//todo public function testMyRename
-	//todo public function testMove
-	//todo public function testCopyDirTo
-	//todo public function testIndexDir
-	//todo public function testIndexAndSortDir
-	//todo public function testFormDirList
-	//todo public function testMkpath
-	//todo public function testGetextension
-	//todo public function testDirsize
-	//todo public function testListAllDirectories
-	//todo public function testListAllFiles
-	//todo public function testCompatLoadFile
-	//todo public function testSetDefaultSettings
-	//todo public function testMkdirs
-
-	public function testUpdatedbInfo(){
-		$action ='';
-		$oldPath ='';
-		$res = DocumentManager::updateDbInfo($action, $oldPath, $newPath="");
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	public function testCheckNameExist(){
-		$filePath ='';
-		$res = check_name_exist($filePath);
-		$this->assertFalse($res);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testMyDelete(){
-		$file='';
-		$res = my_delete($file);
-		$this->assertFalse($res);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res===false);
-		//var_dump($res);
-	}
-
-	public function testRemoveDir(){
-		$dir='';
-		$res = removeDir($dir);
-		$this->assertTrue(is_bool($res));
-		$this->assertFalse($res === true);
-		//var_dump($res);
-	}
-
-	public function testMyRename(){
-		$filePath ='document/';
-		$newFileName='';
-		$res = my_rename($filePath, $newFileName);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testMove(){
-		$source ='';
-		$target ='';
-		$res = move($source, $target);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		$this->assertFalse($res);
-		//var_dump($res);
-	}
-
-	public function testCopyDirTo(){
-		$origDirPath=api_get_path(SYS_COURSE_PATH).'document/audio';
-		$destination=api_get_path(SYS_COURSE_PATH).'document/flash/audio';
-		$res = copyDirTo($origDirPath, $destination, $move = false);
-		$this->assertTrue($res===null);
-		$this->assertNull($res);
-	}
-
-	public function testFormDirList(){
-		$sourceType = '';
-		$sourceComponent = '';
-		$command = '';
-		$baseWorkDir = api_get_path(SYS_COURSE_PATH).'document/';
-		$res = form_dir_list($sourceType, $sourceComponent, $command, $baseWorkDir);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testGetextension(){
-		$filename='documents';
-		$res =getextension($filename);
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
-	}
-
-	public function testDirsize(){
-		$root='';
-		$res =dirsize($root,$recursive=true);
-		$this->assertFalse($res);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res ===0);
-		//var_dump($res);
-	}
-}
diff --git a/tests/main/inc/lib/fileManager.lib.test.php b/tests/main/inc/lib/fileManager.lib.test.php
deleted file mode 100755
index 75adf8d257..0000000000
--- a/tests/main/inc/lib/fileManager.lib.test.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-class TestFileManager extends UnitTestCase {
-
-	public $fmanager;
-	public function TestFileManager(){
-
-		$this->UnitTestCase ('File Display Manager');
-
-
-	}
-
-	public function setUp(){
-
-		$this->fmanager = new FileManager();
-	}
-
-	public function tearDown(){
-
-		$this->fmanager = null;
-	}
-
-	//todo public function testUpdatedbInfo
-	//todo public function testCheckNameExist
-	//todo public function testMyDelete
-	//todo public function testRemoveDir
-	//todo public function testMyRename
-	//todo public function testMove
-	//todo public function testCopyDirTo
-	//todo public function testIndexDir
-	//todo public function testIndexAndSortDir
-	//todo public function testFormDirList
-	//todo public function testMkpath
-	//todo public function testGetextension
-	//todo public function testDirsize
-	//todo public function testListAllDirectories
-	//todo public function testListAllFiles
-	//todo public function testCompatLoadFile
-	//todo public function testSetDefaultSettings
-	//todo public function testMkdirs
-
-	public function testUpdatedbInfo(){
-		$action ='';
-		$oldPath ='';
-		$res = DocumentManager::updateDbInfo($action, $oldPath, $newPath="");
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testCheckNameExist(){
-		$filePath ='';
-		$res = check_name_exist($filePath);
-		$this->assertFalse($res);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testMyDelete(){
-		$file='';
-		$res = my_delete($file);
-		$this->assertFalse($res);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res===false);
-		//var_dump($res);
-	}
-
-	public function testRemoveDir(){
-		$dir='';
-		$res = removeDir($dir);
-		$this->assertTrue(is_bool($res));
-		$this->assertFalse($res === true);
-		//var_dump($res);
-	}
-
-	public function testMyRename(){
-		$filePath ='documents';
-		$newFileName='';
-		$res = my_rename($filePath, $newFileName);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testMove(){
-		$source ='';
-		$target ='';
-		$res = move($source, $target);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		$this->assertFalse($res);
-		//var_dump($res);
-	}
-
-	public function testCopyDirTo(){
-		$origDirPath='';
-		$destination='';
-		$res = copyDirTo($origDirPath, $destination, $move=true);
-		$this->assertTrue($res===null);
-		$this->assertNull($res);
-	}
-
-	public function testFormDirList(){
-		$sourceType='';
-		$sourceComponent='';
-		$command='';
-		$baseWorkDir='';
-		$res =form_dir_list($sourceType, $sourceComponent, $command, $baseWorkDir);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testGetextension(){
-		$filename='documents';
-		$res =getextension($filename);
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
-	}
-
-	public function testDirsize(){
-		$root='';
-		$res =dirsize($root,$recursive=true);
-		$this->assertFalse($res);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res ===0);
-		//var_dump($res);
-	}
-}
diff --git a/tests/main/inc/lib/fileUpload.lib.test.php b/tests/main/inc/lib/fileUpload.lib.test.php
deleted file mode 100755
index 4bc0a3ab1a..0000000000
--- a/tests/main/inc/lib/fileUpload.lib.test.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php');
-
-class TestFileUpload extends UnitTestCase
-{
-
-    public function __construct()
-    {
-        $this->UnitTestCase('File upload library - main/inc/lib/fileUpload.lib.test.php');
-    }
-
-    //Creating
-
-    function testCreateUnexistingDirectory()
-    {
-        global $_course, $user_id;
-        $to_group_id = 1;
-        $to_user_id = 1;
-        $base_work_dir = api_get_path(SYS_COURSE_PATH).'document/';
-        $desired_dir_name = 'images';
-        $res = create_unexisting_directory(
-            $_course,
-            $user_id,
-            $to_group_id,
-            $to_user_id,
-            $base_work_dir,
-            $desired_dir_name
-        );
-
-        if (!is_null($res)) {
-            $this->assertTrue(is_bool($res));
-            $this->assertFalse($res);
-        }
-    }
-
-    /**
-     * Creates a file containing an html redirection to a given url
-     * @param string $filePath
-     * @param string $url
-     * @return void
-     */
-    function testCreateLinkFile()
-    {
-        $base_work_dir = api_get_path(SYS_COURSE_PATH);
-        $filePath = $base_work_dir.'upload/blog';
-        $dirurl = api_get_path(WEB_COURSE_PATH);
-        $url = $dirurl.'doc.php';
-        $res = create_link_file($filePath, $url);
-        if (!is_numeric($res)) {
-            $this->assertFalse($res);
-        } else {
-            $this->assertTrue($res);
-        }
-    }
-
-    /**
-     * This recursive function can be used during the upgrade process form older versions of Dokeos
-     * It crawls the given directory, checks if the file is in the DB and adds it if it's not
-     *
-     * @param string $base_work_dir
-     * @param string $current_path , needed for recursivity
-     */
-    function testAddAllDocumentsInFolderToDatabase()
-    {
-        global $_course, $user_id;
-        $base_work_dir = api_get_path(SYS_PATH).'';
-        $current_path = 'courses/';
-        $to_group_id = 0;
-        $res = add_all_documents_in_folder_to_database($_course, $user_id, $base_work_dir, $current_path, $to_group_id);
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    function testAddDocument()
-    {
-        global $_course;
-        $path = '';
-        $filetype = '';
-        $filesize = '';
-        $title = '';
-        $res = add_document($_course, $path, $filetype, $filesize, $title);
-        if (!is_numeric($res)) :
-            $this->assertTrue(is_bool($res));
-        endif;
-        //var_dump($res);
-    }
-
-    function testAddExtOnMime()
-    {
-        $fileName = '';
-        $fileType = '';
-        $res = add_ext_on_mime($fileName, $fileType);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    //build
-
-    function testBuildMissingFilesForm()
-    {
-        global $_course;
-        $missing_files = array();
-        $upload_path = api_get_path(SYS_CODE_PATH).'default_course_document/images';
-        $file_name = 'board.jpg';
-        $res = build_missing_files_form($missing_files, $upload_path, $file_name);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    //check
-
-    function testCheckForMissingFiles()
-    {
-        $file = '';
-        $res = check_for_missing_files($file);
-        $this->assertTrue(is_bool($res));
-    }
-
-    //space
-
-    function testDirTotalSpace()
-    {
-        $dirPath = api_get_path(SYS_CODE_PATH).'default_course_document/images';
-        $res = dir_total_space($dirPath);
-        $this->assertTrue($res > 0, 'The default_course_document/images dir should be larger than 0 bytes');
-    }
-
-    //filter
-
-    function testfilter_extension()
-    {
-        $filename = 'index.php';
-        $res = filter_extension($filename);
-        $this->assertTrue(is_numeric($res));
-    }
-
-    //get
-
-    function testget_document_title()
-    {
-        $name = '';
-        $res = get_document_title($name);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    function testget_levels()
-    {
-        $filename = 'readme.txt';
-        $res = get_levels($filename);
-        $this->assertTrue(is_numeric($res));
-        //var_dump($res);
-    }
-
-    //access
-
-    function testhtaccess2txt()
-    {
-        $filename = 'readme.txt';
-        $res = htaccess2txt($filename);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    //moving
-
-    function testmove_uploaded_file_collection_into_directory()
-    {
-        global $_course;
-        $uploaded_file_collection = array();
-        $base_work_dir = api_get_path(SYS_COURSE_PATH).'upload/';
-        $missing_files_dir = '';
-        $user_id = 1;
-        $to_group_id = '';
-        $to_user_id = '';
-        $max_filled_space = '';
-        $res = move_uploaded_file_collection_into_directory(
-            $_course,
-            $uploaded_file_collection,
-            $base_work_dir,
-            $missing_files_dir,
-            $user_id,
-            $to_group_id,
-            $to_user_id,
-            $max_filled_space
-        );
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    //php?
-
-    function testphp2phps()
-    {
-        $fileName = 'index.php';
-        $res = php2phps($fileName);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    //searching
-
-    function testsearch_img_from_html()
-    {
-        $imgFilePath = array();
-        $htmlFile = 'file:///var/www/chamilotest/documentation/credits.html';
-        $res = search_img_from_html($htmlFile);
-        if (is_array($res)) {
-            $this->assertTrue(is_array($res));
-        } else {
-            $this->assertTrue(is_null($res));
-        }
-        //var_dump($res);
-    }
-
-    //uploading
-
-    function testprocess_uploaded_file()
-    {
-        $uploaded_file = '';
-        ob_start();
-        $res = process_uploaded_file($uploaded_file);
-        ob_end_clean();
-        $this->assertTrue(is_bool($res));
-    }
-
-    function testhandle_uploaded_document()
-    {
-        global $_course;
-        $uploaded_file = '';
-        $base_work_dir = '';
-        $upload_path = '';
-        $user_id = 1;
-        $to_group_id = 0;
-        $to_user_id = null;
-        $unzip = 0;
-        $what_if_file_exists = '';
-        $output = true;
-        $clean_name = disable_dangerous_file($clean_name);
-        $where_to_save = $base_work_dir.$upload_path;
-        $new_file_path = $upload_path.$clean_name;
-        $clean_name = disable_dangerous_file($clean_name);
-        $file_path = $upload_path.$clean_name;
-        ob_start();
-        $res = handle_uploaded_document(
-            $_course,
-            $uploaded_file,
-            $base_work_dir,
-            $upload_path,
-            $user_id,
-            $to_group_id = 0,
-            $to_user_id = null,
-            $unzip = 0,
-            $what_if_file_exists = '',
-            $output = true
-        );
-        $this->assertTrue(is_null($res));
-        ob_end_clean();
-        //var_dump($res);
-    }
-
-    //updating
-
-    function testupdate_existing_document()
-    {
-        $_course = '';
-        $document_id = '';
-        $filesize = '';
-        $res = update_existing_document($_course, $document_id, $filesize, $readonly = 0);
-        $this->assertTrue(is_bool($res));
-        //var_dump($res);
-    }
-
-    function testitem_property_update_on_folder()
-    {
-        global $_course, $user_id;
-        $path = api_get_path(SYS_COURSE_PATH).'document/license.txt';
-        $res = item_property_update_on_folder($_course, $path, $user_id);
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    //unzipping
-    function testunzip_uploaded_document()
-    {
-        //require_once(api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php');
-        global $_course;
-        global $_user;
-        global $to_user_id;
-        global $to_group_id;
-        $uploaded_file = '';
-        $upload_path = '';
-        $base_work_dir = '';
-        $max_filled_space = '';
-        ob_start();
-        $res = unzip_uploaded_document(
-            $uploaded_file,
-            $upload_path,
-            $base_work_dir,
-            $max_filled_space,
-            $output = true,
-            $to_group_id = 0
-        );
-        ob_end_clean();
-        $this->assertTrue(is_bool($res));
-        //var_dump($res);
-    }
-
-    function testunzip_uploaded_file()
-    {
-        global $_course;
-        $uploadedFile = 'README.txt';
-        $uploadPath = api_get_path(SYS_PATH).$_course.'/document';
-        $baseWorkDir = api_get_path(SYS_PATH);
-        $maxFilledSpace = 1000;
-        $res = unzip_uploaded_file($uploadedFile, $uploadPath, $baseWorkDir, $maxFilledSpace);
-        $this->assertTrue(is_bool($res));
-        //var_dump($res);
-    }
-
-    //disable
-
-    function testDisableDangerousFile()
-    {
-        $filename = 'index.php';
-        $res = disable_dangerous_file($filename);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    //replace
-
-    function testreplace_img_path_in_html_file()
-    {
-        global $_course;
-        $originalImgPath = '';
-        $newImgPath = '';
-        $htmlFile = 'file:///var/www/chamilotest/documentation/credits.html';
-        $res = replace_img_path_in_html_file($originalImgPath, $newImgPath, $htmlFile);
-        $this->assertTrue(is_null($res));
-        //var_dump($res);
-    }
-
-    function testCleanUpFilesInZip()
-    {
-        $p_event = '';
-        $p_header['filename'] = '';
-        $res = clean_up_files_in_zip($p_event, &$p_header);
-        $this->assertTrue(is_numeric($res));
-        //var_dump($res);
-    }
-
-    function testCleanUpPath()
-    {
-        $base_work_dir = api_get_path(SYS_COURSE_PATH);
-        $path = $base_work_dir.'upload/blog';
-        $res = clean_up_path($path);
-        $this->assertTrue(is_numeric($res));
-
-    }
-}
\ No newline at end of file
diff --git a/tests/main/inc/lib/geometry.lib.test.php b/tests/main/inc/lib/geometry.lib.test.php
deleted file mode 100755
index aeb0840f95..0000000000
--- a/tests/main/inc/lib/geometry.lib.test.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-class TestGeometry extends UnitTestCase {
-
-	public function TestGeometry(){
-		$this->UnitTestCase('Geometry library - main/inc/lib/geometry.lib.test.php');
-	}
-    //@TODO: Removed deprecated tests. Make sure to rebuild new tests here
-}
-?>
diff --git a/tests/main/inc/lib/glossary.lib.test.php b/tests/main/inc/lib/glossary.lib.test.php
deleted file mode 100755
index 141ef0eff6..0000000000
--- a/tests/main/inc/lib/glossary.lib.test.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'glossary.lib.php');
-
-class TestGlossary extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Glossary library - main/inc/lib/glossary.lib.test.php');
-        //build a course for these tests
-        TestManager::create_test_course('COURSEGLOSSARY');
-    }
-
-    public function __destruct() {
-    	TestManager::delete_test_course('COURSEGLOSSARY');
-    }
-
-	function testGetGlossaryTerms() {
-		$res = GlossaryManager::get_glossary_terms();
-		$this->assertTrue(is_array($res));
-	}
-
-	function testSaveGlossaryIncomplete() {
-		$values = 'stuffing';
-        ob_start();
-		$res = GlossaryManager::save_glossary($values);
-        ob_end_clean();
-		$this->assertFalse($res);
-	}
-	function testSaveGlossaryComplete() {
-		$values = array('glossary_title'=>'stuffing','glossary_description'=>'something to fill');
-        ob_start();
-        $res = GlossaryManager::save_glossary($values);
-        ob_end_clean();
-        $this->assertTrue(is_numeric($res));
-        $this->assertTrue($res > 0);
-        //clean
-        ob_start();
-        GlossaryManager::delete_glossary($res);
-        ob_end_clean();
-	}
-
-	function testGetGlossaryTermByGlossaryIdIsString() {
-		$glossary_id = 1;
-		$res = GlossaryManager::get_glossary_term_by_glossary_id($glossary_id);
-		$this->assertTrue(is_string($res));
-	}
-	function testGetGlossaryTermByGlossaryIdIsEmpty() {
-		$glossary_id = 1000000;
-        $res = GlossaryManager::get_glossary_term_by_glossary_id($glossary_id);
-        $this->assertEqual($res,'');
-	}
-
-	function testGetGlossaryTermByGlossaryName() {
-		$glossary_name = '';
-		$res = GlossaryManager::get_glossary_term_by_glossary_name($glossary_name);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testUpdateGlossary() {
-		ob_start();
-		$values = '';
-		$res = GlossaryManager::update_glossary($values);
-        ob_end_clean();
-		$this->assertFalse($res);
-	}
-
-	function testGetMaxGlossaryItem() {
-		$res = GlossaryManager::get_max_glossary_item();
-		$this->assertTrue(is_numeric($res));
-	}
-
-
-	function testGlossaryExists() {
-		$term = '';
-		$not_id = 1;
-		$res = GlossaryManager::glossary_exists($term,$not_id);
-		$this->assertTrue(is_bool($res));
-	}
-
-	function testGetGlossaryInformation() {
-		$glossary_id = 1;
-		$res = GlossaryManager::get_glossary_information($glossary_id);
-		$this->assertTrue(is_bool($res));
-	}
-
-
-	function testDisplayGlossary() {
-		ob_start();
-		$res = GlossaryManager::display_glossary();
-        ob_end_clean();
-		$this->assertTrue(is_null($res));
-	}
-
-	function testDisplayGlossaryList() {
-		ob_start();
-		$res = GlossaryManager::displayGlossaryList();
-		ob_end_clean();
-        $this->assertTrue($res);
-	}
-
-	function testGetNumberGlossaryTerms() {
-		$res = GlossaryManager::get_number_glossary_terms();
-		$this->assertTrue(is_numeric($res));
-	}
-
-	function testGetGlossaryData() {
-		$from = 1;
-		$number_of_items = 2;
-		$column = 1;
-		$direction = 'ASC';
-		$res = GlossaryManager::get_glossary_data($from, $number_of_items, $column, $direction);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testActionsFilter() {
-		$glossary_id = 1;
-		$url_params = '';
-		$row = '';
-		$res = GlossaryManager::actions_filter($glossary_id,$url_params,$row);
-		$this->assertTrue(is_string($res));
-	}
-
-	function testJavascriptGlossary() {
-		$res = GlossaryManager::javascript_glossary();
-		$this->assertTrue(is_string($res));
-	}
-
-	function testReorderGlossary() {
-		$res = GlossaryManager::reorder_glossary();
-		$this->assertTrue(is_null($res));
-	}
-
-	function testMoveGlossary() {
-		ob_start();
-		$direction = '';
-		$glossary_id = '';
-		$res = GlossaryManager::move_glossary($direction, $glossary_id);
-        ob_end_clean();
-		$this->assertTrue(is_null($res));
-	}
-
-	function testDeleteGlossaryIsFalse() {
-		ob_start();
-		$glossary_id = 1;
-		$res = GlossaryManager::delete_glossary($glossary_id);
-        ob_end_clean();
-		$this->assertFalse($res);
-	}
-
-	function testDeleteGlossaryIsTrue() {
-		$values = array('glossary_title'=>'stuffing','glossary_description'=>'something to fill');
-		ob_start();
-		$id = GlossaryManager::save_glossary($values);
-		$res = GlossaryManager::delete_glossary($id);
-		ob_end_clean();
-        $this->assertTrue($res);
-	}
-}
\ No newline at end of file
diff --git a/tests/main/inc/lib/groupmanager.lib.test.php b/tests/main/inc/lib/groupmanager.lib.test.php
deleted file mode 100755
index 231a9f4bf9..0000000000
--- a/tests/main/inc/lib/groupmanager.lib.test.php
+++ /dev/null
@@ -1,435 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'database.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'fileManage.lib.php');
-//require_once(api_get_path(LIBRARY_PATH).'tablesort.lib.php');moved to autoload
-
-
-class TestGroupManager extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Group manager library - main/inc/lib/groupmanager.lib.test.php');
-        TestManager::create_test_course('COURSEGROUP');
-    }
-
-    public function __destruct() {
-        TestManager::delete_test_course('COURSEGROUP');
-    }
-
-	/**
-	 *  Tests about groupmanager csv using many class database, class manager,
-	 * file manager, course manager and table sort.
-	 * @author Ricardo Rodriguez Salazar
-	 */
-	public function testGetGroupList(){
-		global $_user;
-		$res = GroupManager::get_group_list();
-		$this->assertTrue(is_array($res));
-	}
-
-	public function testCreateGroupIsNumeric(){
-		$name='1';
-		$category_id='1';
-		$tutor='';
-		$places='1';
-		global $_course, $_user;
-		$res = GroupManager::create_group($name, $category_id, $tutor, $places);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res > 0);
-	}
-
-	public function testCreateSubgroups(){
-		global $_course;
-		$group_id = 1;
-		$number_of_groups = 2;
-		$res = GroupManager::create_subgroups($group_id, $number_of_groups);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testCreateGroupsFromVirtualCourses(){
-		$res = GroupManager::create_groups_from_virtual_courses();
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testCreateClassGroups(){
-		$category_id=2;
-		$res =GroupManager::create_class_groups($category_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testDeleteGroups(){
-		$group_ids='01';
-		$course_code=null;
-		$res =GroupManager::delete_groups($group_ids, $course_code = null);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testGetGroupProperties(){
-		$group_id=01;
-		$res = GroupManager::get_group_properties($group_id);
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testSetGroupProperties()
-    {
-		$group = array(
-            'group_id'=>'01',
-            'name'=>'1',
-            'description'=>'',
-            'maximum_number_of_students'=>'2',
-            'doc_state' =>'',
-            'work_state' =>'',
-            'calendar_state' =>'',
-            'announcements_state'=>'',
-            'forum_state'=>'',
-            'wiki_state'=>'',
-            'chat_state' =>'',
-            'self_registration_allowed'=>'',
-            'self_unregistration_allowed'=>'',
-            'category_id' => null
-        );
-
-		$res = GroupManager::set_group_properties(
-            $group['group_id'],
-            $group['name'],
-            $group['description'],
-            $group['maximum_number_of_students'],
-            $group['doc_state'],
-            $group['work_state'],
-            $group['calendar_state'],
-            $group['announcements_state'],
-            $group['forum_state'],
-            $group['wiki_state'],
-            $group['chat_state'],
-            $group['self_registration_allowed'],
-            $group['self_unregistration_allowed'],
-            $group['category_id']
-        );
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testGetNumberOfGroups(){
-		$res = GroupManager::get_number_of_groups();
-		$this->assertTrue(($res));
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testGetCategories(){
-		$course_code ='COURSETEST';
-		$course_db = 'chamilo_COURSETEST';
-		$res = GroupManager::get_categories($course_code);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testGetCategory(){
-		$id =2;
-		$course_code = 'COURSETEST';
-		$res = GroupManager::get_category($id,$course_code);
-		$this->assertTrue(is_array($res));
-		$this->assertTrue($res);
-		//var_dump($res);
-	}
-
-	public function testGetCategoryFromGroup(){
-		$course_code='COURSETEST';
-		$group_id= 1;
-		$course_db = 'chamilo_COURSETEST';
-		$resu = GroupManager::get_category_from_group($group_id,$course_code);
-		$this->assertTrue(is_bool($resu));
-		//var_dump($res);
-		//var_dump($cat);
-	}
-
-	public function testDeleteCategory(){
-		$cat_id=1;
-		$course_code = 'COURSETEST';
-		$course_db = 'chamilo_COURSETEST';
-		$res = GroupManager::delete_category($cat_id, $course_code);
-		$this->assertTrue(is_null($res));
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	public function testCreateCategory(){
-		$categ = array(
-		'title'=>'group test',
-		'description'=>'description test',
-		'doc_state'=> 1,
-		'work_state'=> 1,
-		'calendar_state'=> 1,
-		'announcements_state' => 1,
-		'forum_state' => 1,
-		'wiki_state' => 1,
-		'chat_state' => 1,
-		'self_registration_allowed' => TRUE,
-		'self_unregistration_allowed' => FALSE,
-		'maximum_number_of_students'=> 2,
-		'groups_per_user'=>4);
-		$res = GroupManager::create_category($categ['title'], $categ['description'],
-		$categ['doc_state'], $categ['work_state'], $categ['calendar_state'],
-		$categ['announcements_state'], $categ['forum_state'],$categ['wiki_state'],
-		$categ['chat_state'],$categ['self_registration_allowed'],$categ['self_unregistration_allowed'],
-		$categ['maximum_number_of_students'],$categ['groups_per_user']);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-
-	}
-
-	public function testUpdateCategory(){
-		$categ = array(
-		'id'=>2,
-		'title'=>'DefaultGroupCategory',
-		'description'=>'xxxxx',
-		'doc_state'=>'xxxx',
-		'work_state'=>'xxxxx',
-		'calendar_state'=>'',
-		'announcements_state'=>'',
-		'forum_state'=>'',
-		'wiki_state'=>'',
-		'chat_state' =>'',
-		'self_registration_allowed'=>'',
-		'self_unregistration_allowed'=>'',
-		'maximum_number_of_students'=>'',
-		'groups_per_user'=>'0');
-		$res = GroupManager::update_category($categ['id'], $categ['title'], $categ['description'],
-		$categ['doc_state'], $categ['work_state'], $categ['calendar_state'], $categ['announcements_state'],
-		$categ['forum_state'],$categ['wiki_state'], $categ['chat_state'],$categ['self_registration_allowed'],$categ['self_unregistration_allowed'],
-		$categ['maximum_number_of_students'],$categ['groups_per_user']);
-		$this->assertTrue(is_null($res));
-		$this->assertTrue($res ===null);
-	}
-
-	public function testGetCurrenMaxGroupsPerUser(){
-		$category_id = 2;
-		$course_code = 'COURSEGROUP';
-		$res =GroupManager::get_current_max_groups_per_user($category_id = null, $course_code = null);
-		$this->assertTrue(is_Null($res));
-	}
-
-	public function testSwapCategoryOrder(){
-		$id1= 1;
-		$id2= 3;
-		$res = GroupManager::swap_category_order($id1,$id2);
-		$this->assertFalse($res);
-		$this->assertNull($res,true);
-	}
-
-	public function testGetUsers(){
-		$group_id= 1;
-		$res =GroupManager::get_users($group_id);
-		$this->assertTrue(is_array($res));
-		$this->assertTrue($res ===array());
-	}
-
-	public function testFillGroups(){
-		global $_course;
-		$group_ids= 2;
-		$res = GroupManager::fill_groups($group_ids);
-		$this->assertNull($res);
-		$this->assertEqual($res,0);
-	}
-
-	public function testNumberOfStudents(){
-		global $_course;
-		$group_id= 2;
-		$res = GroupManager::number_of_students($group_id);
-		$this->assertFalse($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testMaximumNumberOfStudents(){
-		global $_course;
-		$group_id = 2;
-		$res =GroupManager::maximum_number_of_students($group_id);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testUserInNumberOfGroups(){
-		global $_course;
-		$user_id= 1;
-		$cat_id = 6;
-		$res = GroupManager::user_in_number_of_groups($user_id,$cat_id);
-		$this->assertTrue(is_numeric($cat_id));
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testIsSelfRegistrationAllowed(){
-		$user_id = 1;
-		$group_id = 6;
-		$res = GroupManager::is_self_registration_allowed($user_id,$group_id);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testIsSelfUnregistrationAllowed(){
-		$user_id = 2 ;
-		$group_id = 6;
-		$res =GroupManager::is_self_unregistration_allowed($user_id,$group_id);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testIsSubscribed(){
-		$db_result = 2;
-		$user_id = 2;
-		$group_id = 6;
-		$res = GroupManager::is_subscribed($user_id, $group_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testCanUserSubscribe(){
-		global $user_id;
-		$group_id = 2;
-		global $_course;
-		$res = GroupManager::can_user_subscribe($user_id, $group_id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testGetSubscribedUsers(){
-		$group_id = 2;
-		$res = GroupManager::get_subscribed_users($group_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testGetSubscribedTutors(){
-		$group_id = 2;
-		$res = GroupManager::get_subscribed_tutors($group_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testSubscribeUsers(){
-		global $user_ids;
-		$group_id = 2;
-		$res = GroupManager::subscribe_users($user_ids, $group_id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testSubscribeTutors(){
-		global $user_id;
-		$group_id='6';
-		$res &= GroupManager::subscribe_tutors($user_id, $group_id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testUnsubscribeUsers(){
-		$user_ids = array(5);
-		$group_id = 5;
-		$res &= GroupManager::unsubscribe_users($user_ids, $group_id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testUnsubscribeAllUsers(){
-		$group_ids=array(2);
-		$res = GroupManager::unsubscribe_all_users($group_ids);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testUnsubscribeAllTutors(){
-		$group_ids =array(6,9,10,11,14,15,16,19);
-		$res = GroupManager::unsubscribe_all_tutors($group_ids);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testIsTutorOfGroup(){
-		global $user_id;
-		$group_id=2;
-		$res = GroupManager::is_tutor_of_group($user_id,$group_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	public function testIsUserInGroup(){
-		global $user_id;
-		$group_id= 4;
-		$res =GroupManager::is_user_in_group($user_id, $group_id);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		$this->assertFalse($res);
-		//var_dump($res);
-	}
-
-	public function testGetGroupIds(){
-		global $user_id;
-		$course_db= 'chamilo_COURSETEST';
-		$res = GroupManager::get_group_ids($course_db,$user_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testfilter_duplicates(){
-		$user_array_in = '';
-		$compare_field = '';
-		$res = GroupManager::filter_duplicates($user_array_in, $compare_field);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testFilterOnlyStudents(){
-		$user_array_in=array();
-		$res= GroupManager::filter_only_students($user_array_in);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testUserHasAccess(){
-		global $user_id;
-		$group_id='5';
-		$tool='wiki_state';
-		$res = GroupManager::user_has_access($user_id, $group_id, $tool);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === false);
-		//var_dump($res);
-	}
-
-	public function testGetUserGroupName(){
-		global $user_id;
-		$res=GroupManager::get_user_group_name($user_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-/*
-	public function TestDeleteCourse(){
-		$code = 'COURSETEST';
-		$res = CourseManager::delete_course($code);
-		$path = api_get_path(SYS_PATH).'archive';
-		if ($handle = opendir($path)) {
-			while (false !== ($file = readdir($handle))) {
-				if (strpos($file,$code)!==false) {
-					if (is_dir($path.'/'.$file)) {
-						rmdirr($path.'/'.$file);
-					}
-				}
-			}
-			closedir($handle);
-		}
-	}
-*/
-}
-?>
diff --git a/tests/main/inc/lib/image.lib.test.php b/tests/main/inc/lib/image.lib.test.php
deleted file mode 100755
index 40c83e8238..0000000000
--- a/tests/main/inc/lib/image.lib.test.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-require_once api_get_path(LIBRARY_PATH).'image.lib.php';
-
-class TestImage extends UnitTestCase {
-
-	public $timage;
-	public function TestImage(){
-		$this->UnitTestCase('All main image function tests');
-	}
-
-	public function setUp(){
-		$this->timage = new Image();
-	}
-
-	public function tearDown(){
-		$this->timage = null;
-	}
-
-	/*public function testAddBackGround() {
-			$bgfile='';
-			$res = image::addbackground($bgfile);
-			$this->assertTrue(is_null($res));
-			//var_dump($bgfile);
-	}
-
-	public function testAddLogo() {
-			$file='';
-			$res = image::addlogo($file);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	public function testaddtext() {
-			$text='';
-			$res = image::addtext($text);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	public function testcreateimagefromtype() {
-			$file='';
-			$handler='';
-			$res = image::createimagefromtype($file,$handler);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	public function testimageaddback() {
-			$bgfile='';
-			$res = image::image($bgfile);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	public function testmakecolor() {
-	 		$red='';
-	 		$green='';
-	 		$blue='';
-	 		$res = image::makecolor($red, $green, $blue);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	public function testmergelogo() {
-	 		$x='';
-	 		$y='';
-	 		$res = image::mergelogo($x,$y);
-			$this->assertTrue(is_bool($res));
-			//var_dump($res);
-	}*/
-
-	public function testresize() {
-			$thumbw='';
-			$thumbh='';
-			$border='';
-			$res = image::resize($thumbw , $thumbh , $border);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	public function testsend_image() {
-	 		$type='';
-	 		$res = image::send_image($type);
-			$this->assertTrue(is_numeric($res));
-			//var_dump($res);
-	}
-
-/*
-	public function testsetfont() {
-			$fontfile=$this->fontfile;
-			$res = image::setfont($fontfile);
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}*/
-/*
-	public function TestDeleteCourse(){				
-		$code = 'COURSETEST';				
-		$res = CourseManager::delete_course($code);			
-		$path = api_get_path(SYS_PATH).'archive';		
-		if ($handle = opendir($path)) {
-			while (false !== ($file = readdir($handle))) {				
-				if (strpos($file,$code)!==false) {										
-					if (is_dir($path.'/'.$file)) {						
-						rmdirr($path.'/'.$file);						
-					}				
-				}				
-			}
-			closedir($handle);
-		}
-	}
-*/
-}
\ No newline at end of file
diff --git a/tests/main/inc/lib/import.lib.test.php b/tests/main/inc/lib/import.lib.test.php
deleted file mode 100755
index 7e07ed982d..0000000000
--- a/tests/main/inc/lib/import.lib.test.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'import.lib.php');
-
-class TestImport extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('Import library - main/inc/lib/import.lib.test.php');
-    }
-	function testCsvToArray(){
-		$filename='';
-		$res=Import::csvToArray($filename);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/internationalization.lib.test.php b/tests/main/inc/lib/internationalization.lib.test.php
deleted file mode 100755
index 10751fe725..0000000000
--- a/tests/main/inc/lib/internationalization.lib.test.php
+++ /dev/null
@@ -1,1039 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-/**
- * This is a test of internationalization.lib.php which is
- * a common purpose library for supporting internationalization
- * related functions. Only the public API is tested here.
- * @author Ricardo Rodriguez Salazar, 2009.
- * @author Ivan Tcholakov, 2009-2010.
- *
- * Notes:
- * 1. While saving this file, please, preserve its UTF-8 encoding.
- * Othewise this test would be broken.
- * 2. While running this test, send a header declaring UTF-8 encoding.
- * Then you would see variable dumps correctly.
- * 3. Tests about string comparison and sorting might give false results
- * if the intl extension has not been installed.
- */
-
-
-class TestInternationalization extends UnitTestCase {
-
-	private $language_strings = array( // All these strings are UTF-8 encoded.
-		'afrikaans' => "Hy laat my in groen weivelde rus. Hy bring my by waters waar daar vrede is.",
-		'albanian' => "Çdokush prej jush mund të kontribuojë vullnetarisht me dijen e tij për zgjerimin e mëtejshëm të kësaj enciklopedie të lirë.",
-		'alemannic' => "Das bedütet, dass a dem Projekt alli chöi teilnä, wo en alemannischi Dialektspilart beherrsche, wo da gredt wird.",
-		'amharic' => "ዳግማዊ ፡ ምኒልክ ፡ ንጉሠ ፡ ነገሥት ፡ ዘኢትዮጵያ ።",
-		'arabic' => "ما اسمك؟",
-		'armenian' => "Ընդհանուր տեղեկություններ, կառավարման համակարգ, ժողովրդագրություն և աշխարհագրական տվյալներ:",
-		'asturian' => "La ortografía nun ye fonolóxica sinon histórica, tando considerada como una de les llingües más abegoses d'aprender de les qu'usen esi alfabetu.",
-		'belarusian' => "Умоўным часам пачатку гісторыі сучаснай беларускай літаратурнай мовы лічыцца пачатак 19 стагоддзя.",
-		'bosnian' => "Engleski jezik je nastao iz jezika germanskih plemena koja su se u kasnom starom vijeku naselila na jugoistoku otoka Velike Britanije.",
-		'brazilian' => "O governo federal irá zerar o número de municípios sem bibliotecas este ano. De acordo com o Sistema Nacional de Bibliotecas Públicas, 661 municípios ainda não têm esses equipamentos. Se sua cidade não estiver nesta relação e não possuir biblioteca pública municipal, informe aqui. A cultura é um direito de todo o cidadão!",
-		'breton' => "Hon Tad, c'hwi hag a zo en Neñv, ra vo santelaet hoc'h ano. Ra zeuio ho Rouantelezh.",
-		'bulgarian' => "Глобалното затопляне ще освободи Северния ледовит океан от ледовете през лятото през следващите 20 години.",
-		'catalan' => "Els drets juridicolingüístics dels catalanoparlants són ben diferents segons l'indret geogràfic, podem parlar de catalanoparlants de primera i de segona.",
-		'croatian' => "Oče naš, koji jesi na nebesima, sveti se ime Tvoje. Dođi kraljevstvo Tvoje, budi volja Tvoja, kako na Nebu, tako i na Zemlji.",
-		'czech' => "V převážné většině mezinárodních škol je vyučovacím jazykem angličtina.",
-		'danish' => "Et ganske særligt kendetegn ved dansk er stød.",
-		'dari' => "جمعیت افغانستان حدود ۳۰ میلیون نفر برآورد می‌شود. براساس سرشماری مقدماتی کمیته ملی احصائیه کشور، جمعیت افغانستان در سال ۱۳۸۵، ۲۴ میلیون",
-		'dutch' => "De officiële taal, zoals die wordt onderwezen op scholen en gebruikt wordt door de autoriteiten, wordt Standaardnederlands genoemd.",
-		'english' => "Approximately 375 million people speak English as their first language.",
-		'esperanto' => "La vortprovizo de Esperanto devenas plejparte el la okcidenteŭropaj lingvoj, dum ĝia sintakso kaj morfologio montras ankaŭ slavlingvan influon.",
-		'estonian' => "Ta eelistab lubjarikast pinnast, kuid kasvab ka settelistel muldadel ja väheviljakal pinnasel, kus teisi puittaimi ei leidu.",
-		'basque' => "Euskaren gramatika zailtasun handikoa da, horrez gain, hizkuntza indoeuroparra ez izanik, eratze edo joskera bereziak ditu, beste hizkuntzetan aurkitu ez ditzakegunak.",
-		'finnish' => "Nominit taipuvat sijoissa eli sijamuodoissa yleensä sekä yksikössä että monikossa.",
-		'french' => "La majorité du fonds lexical français provient du latin (en tant que langue-mère) ou bien est construit à partir des racines gréco-latines.",
-		'frisian' => "Us Heit, dy't yn de himelen is jins namme wurde hillige. Jins keninkryk komme.",
-		'friulian' => "Mandi, jo mi clami Jacum! Vuê al è propite cjalt! O scugni propite lâ cumò, ariviodisi.",
-		'galician' => "Se borrarán todos los comentarios que, con criterio subjetivo como en toda web, se consideren inadecuados.",
-		'georgian' => "საკუთარ პერიოდში ბუგერო მსოფლიოს ერთ-ერთ უდიდეს მხატვრად იყო აღიარებული, თუმცა მე-20 საუკუნის დასაწყისში მას უკვე არაფრად აგდებდნენ, შესაძლოა მისი იმპრესიონისტთა მიმართ აგრესიულობის გამო. მიუხედავად ამისა, დღეს მას თაყვანისმცემლების ახალი დიდი ტალღა შეემატა - მისი ნამუშევრები მსოფლიოს ასზე მეტ უდიდეს მუზეუმშია გამოფენილი.",
-		'german' => "Durch ihre zentrale Lage in Europa wurde die deutsche Sprache über die Jahrhunderte durch andere Sprachen beeinflusst.",
-		'greek' => "Η ναυτική βιομηχανία αποτέλεσε ένα σημαντικό στοιχείο της Ελληνικής οικονομικής δραστηριότητας από τα αρχαία χρόνια.",
-		'hawaiian' => "A ma mua o ka hō'ea 'ana i Tahiti, ua ho'okele maila lākou mai Sāmoa a Tonga paha.",
-		'hebrew' => "שימו לב: אם עדיין לא נרשמתם, ייתכן כי חלק מהתכונות אינן זמינות לכם. במקרה זה רצוי ליצור חשבון חדש, פעולה האורכת מספר דקות בלבד. ראו איך ליצור חשבון חדש.",
-		'hindi' => "साइट का लिंक लगाने के लिए निम्नांकित फार्मेट में उपयुक्त कक्ष में/या नया कक्ष बना कर लिखें :",
-		'hungarian' => "A magyar nyelv az uráli nyelvcsalád tagja, a finnugor nyelvek közé tartozó ugor nyelvek egyike.",
-		'icelandic' => "Margir Íslendingar telja íslenskuna vera „upprunalegra“ mál en flest önnur og að hún hafi breyst minna.",
-		'indonesian' => "Selain itu, Baristand senantiasa meningkatkan kualitas personil dan berbagai fasilitas pendukung industri, serta fasilitas lainnya yaitu perpustakaan dengan buku-buku ilmiah, laporan hasil penelitian, dan majalah ilmiah.",
-		'irish' => "háinig críoch dheifnideach lena chuid scríbhneoireachta nuair a cuireadh i dteach na ngealt é agus síocóis dhúlagrach ag luí ar a intinn.",
-		'italian' => "Tuttavia l'assetto attuale della lingua è in sostanza quello del fiorentino trecentesco, ripulito dei tratti più marcatamente locali.",
-		'japanese' => "日本語（にほんご、にっぽんご）は、主として、日本で使用されてきた言語である。日本国は法令上、公用語を明記していないが、事実上の公用語となっており、学校教育の「国語」で教えられる。",
-		'korean' => "이 문서는 삭제되었습니다. 이 문서의 삭제/이동 기록은 다음과 같습니다.",
-		'latin' => "Architecti est scientia pluribus disciplinis et variis eruditionibus ornata, cuius iudicio probantur omnia quae ab ceteris artibus perficiuntur opera.",
-		'latvian' => "Tas visvairāk ir vērojams jaunu terminu darināšanā, kas bieži izsauc arī negatīvu reakciju.",
-		'lithuanian' => "Dabartinės literatūrinės kalbos pagrindas remiasi vakarų aukštaičių pietiečių (suvalkiečių) tarme, išlaikiusia senesnes fonetikos ir morfologijos lytis.",
-		'macedonian' => "Залагањето за создавање на македонски литературен јазик датира уште од почетокот на XIX век, со појавата на Просветителите.",
-		'malay' => "Suntingan yang tidak sesuai akan dikeluarkan segera, dan pesalah yang berulang boleh disekat daripada menyunting. Harap maklum.",
-		'manx' => "Haink ram cooney da aavioghey ny Gaelgey liorish yn obbyr recortyssagh jeant liorish aahirreyderyn 'sy 20oo eash.",
-		'marathi' => "समस्त विकिपीडिया वाचक आणि संपादकांना दीपावलीच्या हार्दीक शुभेच्छा !",
-		'middle_frisian' => "30 beest van en wief dat er gen schrift van is dy plæge hem Kom krod my ney de Verman ta.",
-		'mingo' => "Kakwékö nêkê ne'hu niyawë'ö, ne n-u'kaiwayeí ne' thusnye'ö N-awëníyu', ne' húkwa huwënitkëhtahkö haya'tatek, n- utukëstaniak, háwê,",
-		'nepali' => "तपाईंको/तिम्रो नाम के हो?",
-		'norwegian' => "Språksamfunn lånar ord frå meir prestisjefylte språksamfunn, via tospråklege talarar. Studium av lånordslag i norsk speglar dermed samfunnsmessige tilhøve i Europa opp gjennom hundreåra.",
-		'occitan' => "Ara s'estima que sus una populacion de 14 o 15 milions d'occitans, son entre 500 000 e 2 000 000 los que son capables de parlar l'occitan correntament, mas las ocasions de lo parlar dins la societat son raras.",
-		'pashto' => "د راجيت سيتارام پنډت په قول ميلنده پڼهو اصلي نسخه په زړه پښتو ليکل شويده - موړ کتاب چې د",
-		'persian' => "زبان فارسی (پارسی، دری، یا تاجیکی) زبانی است که در کشورهای ایران، افغانستان[۲]، تاجیکستان[۳] و",
-		'polish' => "Język polski wywodzi się z języka praindoeuropejskiego za pośrednictwem języka prasłowiańskiego.",
-		'portuguese' => "Assim como os outros idiomas, o português sofreu uma evolução histórica, sendo influenciado por vários idiomas e dialetos, até chegar ao estágio conhecido atualmente. Deve-se considerar, porém, que o português de hoje compreende vários dialetos e subdialetos, falares e subfalares, muitas vezes bastante distintos, além de dois padrões reconhecidos internacionalmente (português brasileiro e português europeu).",
-		'quechua_cusco' => "Simi yachaqkunaqa rimanakun, qhichwa simi hukllachu achkachu rimay. SIL International nisqa tantanakuy ninmi, 42 rimaymi, nispa.",
-		'romanian' => "Limba română este vorbită în toată lumea de aproximativ 26 de milioane de persoane.",
-		'rumantsch' => "Mintga idiom ha sviluppà sia atgna lingua da scrittira ch'è dentant savens era puspè in cumpromiss tranter ils differents dialects regiunals e locals.",
-		'russian' => "Русский язык — один из восточнославянских языков, один из крупнейших языков мира, в том числе самый распространённый из славянских языков и самый распространённый язык Европы, как географически, так и по числу носителей языка как родного (хотя также значительная и географически большая часть русского языкового ареала находится в Азии).",
-		'sanskrit' => "एयं भाषा न केवलं भारतस्‍य अपितु विश्‍वस्‍यप्राचीनतमा भाषा मन्‍यते। इयं भाषा एतावती समृद्घा अस्‍ति यत्‌ प्राय: सर्वासु भारतीयभाषासु न्‍यूनाधिकरूपेण अस्‍या: शब्‍दा: प्रयुज्‍यन्‍ते. अत: भाषाविदां मते इयं सर्वासां भाषाणां जननी मन्‍यते। पुरा संस्कृतं लोकभाषा आसीत्‌। जना: संस्कृतं वदन्ति स्म॥ विश्‍वस्‍य आदिम: ग्रन्‍थ: ऋग्‍वेद: संस्‍कृतभाषायामेवास्‍ति। अन्‍ये च वेदा: यथा यजुर्वेद:, सामवेद:, अथर्ववेदश्‍च संस्‍कृतभाषायामेव सन्‍ति। आयुर्वेद धनुर्वेद गन्‍धर्ववेदार्थवेदाख्‍या: चत्‍वार: उपवेदा: अपि संस्‍कृते एव विरचिता:॥ सर्वा: उपनिषद: संस्‍कृते उपनिबद्घाः। अन्‍ये ग्रन्‍था: - शिक्षा, कल्‍प, निरुक्त, ज्‍योतिष, छन्‍द, व्‍याकरण, वेदाङ्ग, दर्शन, इतिहास, पुराण, काव्‍य, शास्‍त्र: चेत्यादयः ॥ महर्षि-पाणिनिना विरचिता अष्‍टाध्‍यायी इति संस्‍कृतव्‍याकरणम्‌ अधुनापि भारते विदेशेषु च भाषाविज्ञानिनां प्रेरणास्‍थानं वर्तते ॥ वाक्यकारं वररुचिं भाष्यकारं पतंजलिम् | पाणिनिं सूत्रकारं च प्रणतोस्मि मुनित्रयम् ॥",
-		'scots' => "Anglian speakers wis weel staiblisht in sooth-east Scotland by the 7t century. In the 13t century Norman landawners an thair reteeners, speakin Northumbrian Middle Inglis, wis inveetit tae come an sattle by the Keeng.",
-		'scots_gaelic' => "Ciamar a tha thu? Dè an t-ainm a tha ort? Dè a tha seo?",
-		'serbian' => "Gajica je objavljena je 1830. godine u Zagrebu u „kratkoj osnovi horvatsko-slavonskoga pravopisa“. Razvio ju je Ljudevit Gaj.",
-		'serbian_cyrillic' => "Као и када су други језици у питању, неопходно је разграничити појам језичких система којим се Срби како етницитет служе од стандардног језика који се употребљава у државним и културним институцијама.",
-		'simpl_chinese' => "现代标准汉语，是普通话、国语、华语的统称，指通行于中国大陆和香港、澳门、台湾、海外华人的共通语文，为现代汉语共通的交际口语与书面语，是联合国官方语言之一，是国际人士学习汉语言的主要参照。",
-		'slovak' => "Ak ste nedávno napísali tento článok, skúste vyčistiť jeho vyrovnávaciu pamäť alebo chvíľu počkať predtým, než ho znova vytvoríte.",
-		'slovenian' => "Slovénščina je južnoslovanski jezik z okoli 2,2 milijonoma govorcev po svetu, od katerih jih večina živi v Sloveniji. Je eden redkih indoevropskih jezikov, ki je še ohranil dvojino.",
-		'spanish' => "El castellano es lengua oficial de España. También se habla en Gibraltar[70] y en Andorra (donde es la lengua materna mayoritaria debido a la inmigración, pero no es la lengua propia y oficial como sí lo es el catalán[71] ).",
-		'swahili' => "Lugha hii ina utajiri mkubwa wa misamiati na misemo na mithali na mashairi na mafumbo na vitendawili na nyimbo.",
-		'swedish' => "Hej. Hur är det? Bara bra, tack. Förlåt, jag har glömt, varifrån kommer du nu igen?",
-		'tagalog' => "Ang Wikibooks ay isang ambagang proyekto sa pagkagawa ng isang koleksyon ng mga libre at malayang-kontentong pang-araling aklat na pwede mong baguhin.",
-		'tamil' => "நீங்கள் ஆங்கிலம் பேசுவீர்களா?",
-		'thai' => "ภาษาไทย เป็นภาษาราชการของประเทศไทย และภาษาแม่ของชาวไทย และชนเชื้อสายอื่นในประเทศไทย ภาษาไทยเป็นภาษาในกลุ่มภาษาไต ซึ่งเป็นกลุ่มย่อยของตระกูลภาษาไท-กะได สันนิษฐานว่า",
-		'trad_chinese' => "中華民國，在亞東之極，本都南京，因事失地泰半，暫遷於臺北。其東以鴨綠江界朝鮮國，隔東海望日本。其北與俄羅斯相接。其西有大山，天下至高者也。而皆失於內戰，今僅得臺灣及其周圍矣。",
-		'turkish' => "Bu kitapta Türkçe konuşmak, yazmak ve okumak için gereken her şeyi bulacaksınız.",
-		'ukrainian' => "Українська мова є мовою найбільшого корінного етносу України і невід'ємною базовою ознакою його ідентичності протягом багатьох століть.",
-		'vietnamese' => "Tiếng Việt là ngôn ngữ chính thức tại Việt Nam, và cũng là ngôn ngữ phổ thông đối với các dân tộc thiểu số tại Việt Nam.",
-		'welsh' => "Gan nad oedd y Frythoneg yn iaith ysgrifenedig tystiolaeth anuniongyrchol yn unig sydd i'r newidiadau a ddigwyddodd iddi.",
-		'yiddish' => "יידיש אדער אידיש (Yiddish) גערופֿן ביי אידן אלס מאַמע לשון, איז אַ שפּראַך װאָס װערט הײַנט גערעדט ביי 1.5 מיליאָן יידן[1] און באַקאַנט ביי 3,142,560 מיליאָן [2] מענטשן איבער דער װעלט, בעיקר פֿונעם אַשכנזישן אָפּשטאַם.",
-		'yoruba' => "Èdè Yorùbá Ní báyìí, tí a bá wo èdè Yorùbá, àwon onímò pín èdè náà sábée èyà wa nínú e bí èdè Niger-Congo. Wón tún fìdí rè múlè pé èyà wa yìí ló wópò jùlo ní síso, ní ìwò oòrùn aláwò dúdú fún egbe-egbèrún odún."
-	);
-
-	function TestInternationalization() {
-        $this->UnitTestCase('Internationalization library - main/inc/lib/internationalization.lib.test.php');
-	}
-
-/**
- * ----------------------------------------------------------------------------
- * Multibyte string conversion functions
- * ----------------------------------------------------------------------------
- */
-
-	public function test_api_convert_encoding() {
-		$string = 'xxxáéíóú?€'; // UTF-8
-		$from_encoding = 'UTF-8';
-		$to_encoding = 'ISO-8859-15';
-		$res = api_convert_encoding($string, $to_encoding, $from_encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(api_convert_encoding($res, $from_encoding, $to_encoding) == $string);
-		//var_dump($res);
-		//var_dump(api_convert_encoding($res, $from_encoding, $to_encoding));
-	}
-
-	public function test_api_utf8_encode() {
-		$string = 'xxxáéíóú?€'; // UTF-8
-		$from_encoding = 'ISO-8859-15';
-		$string1 = api_utf8_decode($string, $from_encoding);
-		$res = api_utf8_encode($string1, $from_encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == $string);
-		//var_dump($res);
-	}
-
-	public function test_api_utf8_decode() {
-		$string = 'xxxx1ws?!áéíóú@€'; // UTF-8
-		$to_encoding = 'ISO-8859-15';
-		$res = api_utf8_decode($string, $to_encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(api_utf8_encode($res, $to_encoding) == $string);
-		//var_dump($res);
-	}
-
-	public function test_api_to_system_encoding() {
-		$string = api_utf8_encode(get_lang('Title'), api_get_system_encoding());
-		$from_encoding = 'UTF-8';
-		$check_utf8_validity = false;
-		$res = api_to_system_encoding($string, $from_encoding, $check_utf8_validity);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(api_convert_encoding($res, $from_encoding, api_get_system_encoding()) == $string);
-		//var_dump(api_utf8_encode($res, api_get_system_encoding()));
-	}
-
-	public function test_api_htmlentities() {
-		$string = 'áéíóú@!?/\-_`*ç´`'; // UTF-8
-		$quote_style = ENT_QUOTES;
-		$encoding = 'UTF-8';
-		$res = api_htmlentities($string, $quote_style, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(api_convert_encoding($res, $encoding, 'HTML-ENTITIES') == $string);
-		//var_dump($res);
-	}
-
-	public function test_api_html_entity_decode() {
-		$string = 'áéíóú@/\!?Ç´`+*?-_ '; // UTF-8
-		$quote_style = ENT_QUOTES;
-		$encoding = 'UTF-8';
-		$res = api_html_entity_decode(api_convert_encoding($string, 'HTML-ENTITIES', $encoding), $quote_style, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == $string);
-		//var_dump($res);
-	}
-
-	public function test_api_xml_http_response_encode() {
-		$string='áéíóú@/\!?Ç´`+*?-_'; // UTF-8
-		$from_encoding = 'UTF-8';
-		$res = api_xml_http_response_encode($string, $from_encoding);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function test_api_transliterate() {
-		$string = 'Фёдор Михайлович Достоевкий'; // UTF-8
-		/*
-		// If you have broken by mistake UTF-8 encoding of this source, try the following equivalent:
-		$string = api_html_entity_decode(
-			'&#1060;&#1105;&#1076;&#1086;&#1088; '.
-			'&#1052;&#1080;&#1093;&#1072;&#1081;&#1083;&#1086;&#1074;&#1080;&#1095; '.
-			'&#1044;&#1086;&#1089;&#1090;&#1086;&#1077;&#1074;&#1082;&#1080;&#1081;',
-			ENT_QUOTES, 'UTF-8');
-		*/
-		$unknown = 'X';
-		$from_encoding = 'UTF-8';
-		$res = api_transliterate($string, $unknown, $from_encoding);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'Fyodor Mihaylovich Dostoevkiy');
-		//var_dump($string);
-		//var_dump($res);
-	}
-
-
-/**
- * ----------------------------------------------------------------------------
- * Common multibyte string functions
- * ----------------------------------------------------------------------------
- */
-
-	public function test_api_ord() {
-		$encoding = 'UTF-8';
-		$characters = array('И', 'в', 'а', 'н', ' ', 'I', 'v', 'a', 'n'); // UTF-8
-		$codepoints = array(1048, 1074, 1072, 1085, 32, 73, 118, 97, 110);
-		$res = array();
-		foreach ($characters as $character) {
-			$res[] = api_ord($character, $encoding);
-		}
-		$this->assertTrue($res == $codepoints);
-		//var_dump($res);
-	}
-
-	public function test_api_str_ireplace() {
-		$search = 'Á'; // UTF-8
-		$replace = 'a';
-		$subject = 'bájando'; // UTF-8
-		$count = null;
-		$encoding = 'UTF-8';
-		$res = api_str_ireplace($search, $replace, $subject, & $count, $encoding);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'bajando');
-		//var_dump($res);
-	}
-
-	public function test_api_str_split() {
-		$string = 'áéíóúº|\/?Ç][ç]'; // UTF-8
-		$split_length = 1;
-		$encoding = 'UTF-8';
-		$res = api_str_split($string, $split_length, $encoding);
-		$this->assertTrue(is_array($res));
-		$this->assertTrue(count($res) == 15);
-		//var_dump($res);
-	}
-
-	public function test_api_stripos() {
-		$haystack = 'bájando'; // UTF-8
-		$needle = 'Á';
-		$offset = 0;
-		$encoding = 'UTF-8';
-		$res = api_stripos($haystack, $needle, $offset, $encoding);
-		$this->assertTrue(is_numeric($res)|| is_bool($res));
-		$this->assertTrue($res == 1);
-		//var_dump($res);
-	}
-
-	public function test_api_stristr() {
-		$haystack = 'bájando'; // UTF-8
-		$needle = 'Á';
-		$part = false;
-		$encoding = 'UTF-8';
-		$res = api_stristr($haystack, $needle, $part, $encoding);
-		$this->assertTrue(is_bool($res) || is_string($res));
-		$this->assertTrue($res == 'ájando');
-		//var_dump($res);
-	}
-
-	public function test_api_strlen() {
-		$string='áéíóúº|\/?Ç][ç]'; // UTF-8
-		$encoding = 'UTF-8';
-		$res = api_strlen($string, $encoding);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res == 15);
-		//var_dump($res);
-	}
-
-	public function test_api_strpos() {
-		$haystack = 'bájando'; // UTF-8
-		$needle = 'á';
-		$offset = 0;
-		$encoding = 'UTF-8';
-		$res = api_strpos($haystack, $needle, $offset, $encoding);
-		$this->assertTrue(is_numeric($res)|| is_bool($res));
-		$this->assertTrue($res == 1);
-		//var_dump($res);
-	}
-
-	public function test_api_strrchr() {
-		$haystack = 'aviación aviación'; // UTF-8
-		$needle = 'ó';
-		$part = false;
-		$encoding = 'UTF-8';
-		$res = api_strrchr($haystack, $needle, $part, $encoding);
-		$this->assertTrue(is_string($res)|| is_bool($res));
-		$this->assertTrue($res == 'ón');
-		//var_dump($res);
-	}
-
-	public function test_api_strrev() {
-		$string = 'áéíóúº|\/?Ç][ç]'; // UTF-8
-		$encoding = 'UTF-8';
-		$res = api_strrev($string, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == ']ç[]Ç?/\|ºúóíéá');
-		//var_dump($res);
-	}
-
-	public function test_api_strripos() {
-		$haystack = 'aviación aviación'; // UTF-8
-		$needle = 'Ó';
-		$offset = 0;
-		$encoding = 'UTF-8';
-		$res = api_strripos($haystack, $needle, $offset, $encoding);
-		$this->assertTrue(is_numeric($res) || is_bool($res));
-		$this->assertTrue($res == 15);
-		//var_dump($res);
-	}
-
-	public function test_api_strrpos() {
-		$haystack = 'aviación aviación'; // UTF-8
-		$needle = 'ó';
-		$offset = 0;
-		$encoding = 'UTF-8';
-		$res = api_strrpos($haystack, $needle, $offset, $encoding);
-		$this->assertTrue(is_numeric($res) || is_bool($res));
-		$this->assertTrue($res == 15);
-		//var_dump($res);
-	}
-
-	public function test_api_strstr() {
-		$haystack = 'aviación'; // UTF-8
-		$needle = 'ó';
-		$part = false;
-		$encoding = 'UTF-8';
-		$res = api_strstr($haystack, $needle, $part, $encoding);
-		$this->assertTrue(is_bool($res)|| is_string($res));
-		$this->assertTrue($res == 'ón');
-		//var_dump($res);
-	}
-
-	public function test_api_strtolower() {
-		$string = 'áéíóúº|\/?Ç][ç]'; // UTF-8
-		$encoding = 'UTF-8';
-		$res = api_strtolower($string, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'áéíóúº|\/?ç][ç]');
-		//var_dump($res);
-	}
-
-	public function test_api_strtoupper() {
-		$string='áéíóúº|\/?Ç][ç]'; // UTF-8
-		$encoding = 'UTF-8';
-		$res = api_strtoupper($string, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res =='ÁÉÍÓÚº|\/?Ç][Ç]');
-		//var_dump($res);
-	}
-
-	public function test_api_substr() {
-		$string = 'áéíóúº|\/?Ç][ç]'; // UTF-8
-		$start = 10;
-		$length = 4;
-		$encoding = 'UTF-8';
-		$res = api_substr($string, $start, $length, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'Ç][ç');
-		//var_dump($res);
-	}
-
-	public function test_api_substr_replace() {
-		$string = 'áéíóúº|\/?Ç][ç]'; // UTF-8
-		$replacement = 'eiou';
-		$start= 1;
-		$length = 4;
-		$encoding = 'UTF-8';
-		$res = api_substr_replace($string, $replacement, $start, $length, $encoding);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'áeiouº|\/?Ç][ç]');
-		//var_dump($res);
-	}
-
-	public function test_api_ucfirst() {
-		$string = 'áéíóúº|\/? xx ][ xx ]'; // UTF-8
-		$encoding = 'UTF-8';
-		$res = api_ucfirst($string, $encoding);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'Áéíóúº|\/? xx ][ xx ]');
-		//var_dump($res);
-	}
-
-	public function test_api_ucwords() {
-		$string = 'áéíóúº|\/? xx ][ xx ]'; // UTF-8
-		$encoding = 'UTF-8';
-		$res = api_ucwords($string, $encoding);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'Áéíóúº|\/? Xx ][ Xx ]');
-		//var_dump($res);
-	}
-
-
-/**
- * ----------------------------------------------------------------------------
- * String operations using regular expressions
- * ----------------------------------------------------------------------------
- */
-
-	public function test_api_preg_match() {
-		$pattern = '/иван/i'; // UTF-8
-		$subject = '-- Ivan (en) -- Иван (bg) --'; // UTF-8
-		$matches = null;
-		$flags = 0;
-		$offset = 0;
-		$encoding = 'UTF-8';
-		$res = api_preg_match($pattern, $subject, $matches, $flags, $offset, $encoding);
-		$this->assertTrue($res == 1);
-		//var_dump($res);
-		//var_dump($matches);
-	}
-
-	public function test_api_preg_match_all() {
-		$pattern = '/иван/i'; // UTF-8
-		$subject = '-- Ivan (en) -- Иван (bg) -- иван --'; // UTF-8
-		$matches = null;
-		$flags = PREG_PATTERN_ORDER;
-		$offset = 0;
-		$encoding = 'UTF-8';
-		$res = api_preg_match_all($pattern, $subject, $matches, $flags, $offset, $encoding);
-		$this->assertTrue($res == 2);
-		//var_dump($res);
-		//var_dump($matches);
-	}
-
-	public function test_api_preg_replace() {
-		$pattern = '/иван/i'; // UTF-8
-		$replacement = 'ИВАН'; // UTF-8
-		$subject = '-- Ivan (en) -- Иван (bg) -- иван --'; // UTF-8
-		$limit = -1;
-		$count = null;
-		$encoding = 'UTF-8';
-		$res = api_preg_replace($pattern, $replacement, $subject, $limit, $count, $encoding);
-		$this->assertTrue($res == '-- Ivan (en) -- ИВАН (bg) -- ИВАН --'); // UTF-8
-		//var_dump($res);
-	}
-
-
-	public function test_api_preg_split() {
-		$pattern = '/иван/i'; // UTF-8
-		$subject = '-- Ivan (en) -- Иван (bg) -- иван --'; // UTF-8
-		$limit = -1;
-		$count = null;
-		$encoding = 'UTF-8';
-		$res = api_preg_split($pattern, $subject, $limit, $count, $encoding);
-		$this->assertTrue($res[0] == '-- Ivan (en) -- '); // UTF-8
-		//var_dump($res);
-	}
-
-
-/**
- * ----------------------------------------------------------------------------
- * Obsolete string operations using regular expressions, to be deprecated
- * ----------------------------------------------------------------------------
- */
-
-	public function test_api_ereg() {
-		$pattern = 'scorm/showinframes.php([^"\'&]*)(&|&amp;)file=([^"\'&]*)$';
-		$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&amp;file=test.php';
-		$regs = array();
-		$res = api_ereg($pattern, $string, $regs);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($regs);
-		//var_dump($res);
-	}
-
-	public function test_api_eregi() {
-		$pattern = 'scorm/showinframes.php([^"\'&]*)(&|&amp;)file=([^"\'&]*)$';
-		$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&amp;file=test.php';
-		$regs = array();
-		$res = api_eregi($pattern, $string, $regs);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($regs);
-		//var_dump($res);
-	}
-
-
-	/**
-	 * ----------------------------------------------------------------------------
-	 * String comparison
-	 * ----------------------------------------------------------------------------
-	 */
-
-	public function test_api_strcasecmp() {
-		$string1 = 'áéíóu'; // UTF-8
-		$string2 = 'Áéíóu'; // UTF-8
-		$language = 'english';
-		$encoding = 'UTF-8';
-		$res = api_strcasecmp($string1, $string2, $language, $encoding);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res == 0);
-		//var_dump($res);
-	}
-
-	public function test_api_strcmp() {
-		$string1 = 'áéíóu'; // UTF-8
-		$string2 = 'Áéíóu'; // UTF-8
-		$language = 'english';
-		$encoding = 'UTF-8';
-		$res = api_strcmp($string1, $string2, $language, $encoding);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res == 1);
-		//var_dump($res);
-	}
-
-	public function  test_api_strnatcmp() {
-		$string1 = '201áéíóu.txt'; // UTF-8
-		$string2 = '30áéíóu.TXT'; // UTF-8
-		$language = 'english';
-		$encoding = 'UTF-8';
-		$res = api_strnatcmp($string1, $string2, $language, $encoding);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res == 1);
-		//var_dump($res);
-	}
-
-
-	/**
-	 * ----------------------------------------------------------------------------
-	 * Sorting arrays
-	 * ----------------------------------------------------------------------------
-	 */
-
-	public function test_api_natsort() {
-		$array = array('img12.png', 'img10.png', 'img2.png', 'img1.png'); // UTF-8
-		$language = 'english';
-		$encoding = 'UTF-8';
-		$res = api_natsort($array, $language, $encoding);
-		$keys = array_keys($array);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($array[$keys[0]] == 'img1.png');
-		//var_dump($array);
-		//var_dump($res);
-	}
-
-	public function test_api_natrsort() {
-		$array = array('img2.png', 'img10.png', 'img12.png', 'img1.png'); // UTF-8
-		$language = 'english';
-		$encoding = 'UTF-8';
-		$res = api_natrsort($array, $language, $encoding);
-		$keys = array_keys($array);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($array[$keys[0]] == 'img12.png');
-		//var_dump($array);
-		//var_dump($res);
-	}
-
-	/**
-	 * ----------------------------------------------------------------------------
-	 * Encoding management functions
-	 * ----------------------------------------------------------------------------
-	 */
-
-	public function test_api_refine_encoding_id() {
-		$encoding = 'koI8-r';
-		$res = api_refine_encoding_id($encoding);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'KOI8-R');
-		//var_dump($res);
-	}
-
-	public function test_api_equal_encodings() {
-		$encoding1 = 'cp65001';
-		$encoding2 = 'utf-8';
-		$encoding3 = 'WINDOWS-1251';
-		$encoding4 = 'WINDOWS-1252';
-		$encoding5 = 'win-1250';
-		$encoding6 = 'windows-1250';
-		$res1 = api_equal_encodings($encoding1, $encoding2);
-		$res2 = api_equal_encodings($encoding3, $encoding4);
-		$res3 = api_equal_encodings($encoding5, $encoding6);
-		$res4 = api_equal_encodings($encoding5, $encoding6, true);
-		$this->assertTrue(is_bool($res1));
-		$this->assertTrue(is_bool($res2));
-		$this->assertTrue(is_bool($res3));
-		$this->assertTrue(is_bool($res4));
-		$this->assertTrue($res1);
-		$this->assertTrue(!$res2);
-		$this->assertTrue($res3);
-		$this->assertTrue(!$res4);
-		//var_dump($res1);
-		//var_dump($res2);
-		//var_dump($res3);
-		//var_dump($res4);
-	}
-
-	public function test_api_is_utf8() {
-		$encoding = 'cp65001'; // This an alias of UTF-8.
-		$res = api_is_utf8($encoding);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res);
-		//var_dump($res);
-	}
-
-	public function test_api_get_system_encoding() {
-		$res = api_get_system_encoding();
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res);
-		//var_dump($res);
-	}
-
-	public function test_api_is_encoding_supported() {
-		$encoding1 = 'UTF-8';
-		$encoding2 = 'XXXX#%#%VR^%BBDNdjlrsg;d';
-		$res1 = api_is_encoding_supported($encoding1);
-		$res2 = api_is_encoding_supported($encoding2);
-		$this->assertTrue(is_bool($res1) && is_bool($res2));
-		$this->assertTrue($res1 && !$res2);
-		//var_dump($res1);
-		//var_dump($res2);
-	}
-
-	public function test_api_get_non_utf8_encoding() {
-		$language = 'bulgarian';
-		$res = api_get_non_utf8_encoding($language);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'WINDOWS-1251');
-		//var_dump($res);
-	}
-
-	public function test_api_detect_encoding_html() {
-		$meta = '<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15" />'."\n";
-		$head1 = '<head>'."\n".'<title>Sample Document</title>'."\n".'</head>'."\n";
-		$head2 = '<head>'."\n".'<title>Sample Document</title>'."\n".$meta.'</head>'."\n";
-		$body1 = '<p>This is a sample document for testing encoding detection.</p>'."\n";
-		$body2 = '<body>'."\n".$body1.'</body>';
-		$html1 = $body1; // A html-snippet, see for example some log-files created by the "Chat" tool.
-		$html2 = '<html>'."\n".$head1.$body2."\n".'</html>'; // A full html-document, no encoding has been declared.
-		$html3 = '<html>'."\n".$head2.$body2."\n".'</html>'; // A full html-document, encoding has been declared.
-		$res1 = api_detect_encoding_html($html1);
-		$res2 = api_detect_encoding_html($html2);
-		$res3 = api_detect_encoding_html($html3);
-		$this->assertTrue(
-			$res1 === 'UTF-8'
-			&& $res2 === 'UTF-8'
-			&& $res3 === 'ISO-8859-15'
-		);
-		//var_dump($res1);
-		//var_dump($res2);
-		//var_dump($res3);
-	}
-
-	public function test_api_detect_encoding_xml() {
-		$xml1 = '
-			<Users>
-				<User>
-					<Username>username1</Username>
-					<Lastname>xxx</Lastname>
-					<Firstname>xxx</Firstname>
-					<Password>xxx</Password>
-					<Email>xxx@xx.xx</Email>
-					<OfficialCode>xxx</OfficialCode>
-					<Phone>xxx</Phone>
-					<Status>student</Status>
-				</User>
-			</Users>'; // US-ASCII
-		$xml2 = '<?xml version="1.0" encoding="ISO-8859-15"?>'.$xml1;
-		$xml3 = '<?xml version="1.0" encoding="utf-8"?>'.$xml1;
-		$xml4 = str_replace('<Lastname>xxx</Lastname>', '<Lastname>x'.chr(192).'x</Lastname>', $xml1); // A non-UTF-8 character has been inserted.
-		$res1 = api_detect_encoding_xml($xml1);
-		$res2 = api_detect_encoding_xml($xml2);
-		$res3 = api_detect_encoding_xml($xml3);
-		$res4 = api_detect_encoding_xml($xml4);
-		$res5 = api_detect_encoding_xml($xml4, 'windows-1251');
-		$this->assertTrue(
-			$res1 === 'UTF-8'
-			&& $res2 === 'ISO-8859-15'
-			&& $res3 === 'UTF-8'
-			&& api_equal_encodings($res4, api_get_system_encoding())
-			&& $res5 === 'WINDOWS-1251'
-		);
-		//var_dump($res1);
-		//var_dump($res2);
-		//var_dump($res3);
-		//var_dump($res4);
-		//var_dump($res5);
-	}
-
-	public function test_api_convert_encoding_xml() {
-		$xml = '
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Users>
-				<User>
-					<Username>username1</Username>
-					<Lastname>xxx</Lastname>
-					<Firstname>Иван</Firstname>
-					<Password>xxx</Password>
-					<Email>xxx@xx.xx</Email>
-					<OfficialCode>xxx</OfficialCode>
-					<Phone>xxx</Phone>
-					<Status>student</Status>
-				</User>
-			</Users>'; // UTF-8
-		$res1 = api_convert_encoding_xml($xml, 'WINDOWS-1251', 'UTF-8');
-		$res2 = api_convert_encoding_xml($xml, 'WINDOWS-1251');
-		$res3 = api_convert_encoding_xml($res1, 'UTF-8', 'WINDOWS-1251');
-		$res4 = api_convert_encoding_xml($res2, 'UTF-8');
-		$this->assertTrue(
-			$res3 === $xml
-			&& $res4 === $xml
-		);
-		//var_dump(preg_replace(array('/\r?\n/m', '/\t/m'), array('<br />', '&nbsp;&nbsp;&nbsp;&nbsp;'), htmlspecialchars($res1)));
-		//var_dump(preg_replace(array('/\r?\n/m', '/\t/m'), array('<br />', '&nbsp;&nbsp;&nbsp;&nbsp;'), htmlspecialchars($res2)));
-		//var_dump(preg_replace(array('/\r?\n/m', '/\t/m'), array('<br />', '&nbsp;&nbsp;&nbsp;&nbsp;'), htmlspecialchars($res3)));
-		//var_dump(preg_replace(array('/\r?\n/m', '/\t/m'), array('<br />', '&nbsp;&nbsp;&nbsp;&nbsp;'), htmlspecialchars($res4)));
-	}
-
-	public function test_api_utf8_encode_xml() {
-		$xml1 = '
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Users>
-				<User>
-					<Username>username1</Username>
-					<Lastname>xxx</Lastname>
-					<Firstname>Иван</Firstname>
-					<Password>xxx</Password>
-					<Email>xxx@xx.xx</Email>
-					<OfficialCode>xxx</OfficialCode>
-					<Phone>xxx</Phone>
-					<Status>student</Status>
-				</User>
-			</Users>'; // UTF-8
-		$xml2 = '
-			<?xml version="1.0" encoding="WINDOWS-1251"?>
-			<Users>
-				<User>
-					<Username>username1</Username>
-					<Lastname>xxx</Lastname>
-					<Firstname>'.chr(200).chr(226).chr(224).chr(237).'</Firstname>
-					<Password>xxx</Password>
-					<Email>xxx@xx.xx</Email>
-					<OfficialCode>xxx</OfficialCode>
-					<Phone>xxx</Phone>
-					<Status>student</Status>
-				</User>
-			</Users>'; // WINDOWS-1251
-		$res1 = api_utf8_encode_xml($xml2);
-		$this->assertTrue($res1 === $xml1);
-		//var_dump(preg_replace(array('/\r?\n/m', '/\t/m'), array('<br />', '&nbsp;&nbsp;&nbsp;&nbsp;'), htmlspecialchars($res1)));
-	}
-
-	public function test_api_utf8_decode_xml() {
-		$xml1 = '
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Users>
-				<User>
-					<Username>username1</Username>
-					<Lastname>xxx</Lastname>
-					<Firstname>Иван</Firstname>
-					<Password>xxx</Password>
-					<Email>xxx@xx.xx</Email>
-					<OfficialCode>xxx</OfficialCode>
-					<Phone>xxx</Phone>
-					<Status>student</Status>
-				</User>
-			</Users>'; // UTF-8
-		$xml2 = '
-			<?xml version="1.0" encoding="WINDOWS-1251"?>
-			<Users>
-				<User>
-					<Username>username1</Username>
-					<Lastname>xxx</Lastname>
-					<Firstname>'.chr(200).chr(226).chr(224).chr(237).'</Firstname>
-					<Password>xxx</Password>
-					<Email>xxx@xx.xx</Email>
-					<OfficialCode>xxx</OfficialCode>
-					<Phone>xxx</Phone>
-					<Status>student</Status>
-				</User>
-			</Users>'; // WINDOWS-1251
-		$res1 = api_utf8_decode_xml($xml1, 'WINDOWS-1251');
-		$this->assertTrue($res1 === $xml2);
-		//var_dump(preg_replace(array('/\r?\n/m', '/\t/m'), array('<br />', '&nbsp;&nbsp;&nbsp;&nbsp;'), htmlspecialchars($res1)));
-	}
-
-/**
- * ----------------------------------------------------------------------------
- * String validation functions concerning certain encodings
- * ----------------------------------------------------------------------------
- */
-
-	public function test_api_is_valid_utf8() {
-		$string = 'áéíóú1@\/-ḉ`´';
-		$res = api_is_valid_utf8($string);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res);
-		//var_dump($res);
-	}
-
-	public function test_api_is_valid_ascii() {
-		$string = 'áéíóú'; // UTF-8
-		$res = api_is_valid_ascii($string);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue(!$res);
-		//var_dump($res);
-	}
-
-	public function test_api_get_valid_language() {
-		$enabled_languages_info = api_get_languages();
-		$enabled_languages = $enabled_languages_info['folder'];
-		$language = array();
-		$language[] = '   '.strtoupper(api_get_interface_language()).'    ';
-		$language[] = " \t   ".strtoupper(api_get_setting('platformLanguage'))."   \t ";
-		$language[] = 'xxxxxxxxxxxxxx';
-		$language[] = '   \t'.strtoupper('bulgarian').'    ';
-		$res = array();
-		$res[] = api_get_valid_language($language[1]);
-		$res[] = api_get_valid_language($language[2]);
-		$res[] = api_get_valid_language($language[3]);
-		$res[] = api_get_valid_language($language[4]);
-		$expected = array();
-		foreach ($language as $value) {
-			$value = str_replace('_km', '_KM', strtolower(trim($value)));
-			if (empty($value) || !in_array($value, $enabled_languages) || !api_is_language_supported($value)) {
-				$value = api_get_setting('platformLanguage');
-			}
-			$expected = $value;
-		}
-		$is_ok = true;
-		foreach ($language as $key => $value) {
-			$is_ok = $is_ok && ($value === $res[$key]);
-		}
-		//var_dump($res);
-		//var_dump($expected);
-	}
-
-	public function test_api_purify_language_id() {
-		$language = 'english_org';
-		$res = api_purify_language_id($language);
-		$this->assertTrue(is_string($res));
-		$this->assertTrue($res == 'english');
-		//var_dump($res);
-	}
-
-	function test_api_get_language_isocode() {
-		$test_language_table = array(
-			'*** invalid entry ***' => 'en', // An invalid entry.
-			'arabic' => 'ar',
-			'arabic_unicode' => 'ar',
-			'asturian' => 'ast',
-			'bosnian' => 'bs',
-			'brazilian' => 'pt-BR',
-			'bulgarian' => 'bg',
-			'catalan' => 'ca',
-			'croatian' => 'hr',
-			'czech' => 'cs',
-			'danish' => 'da',
-			'dari' => 'prs',
-			'dutch' => 'nl',
-			'dutch_corporate' => 'nl',
-			'english' => 'en',
-			'english_org' => 'en',
-			'esperanto' => 'eo',
-			'basque' => 'eu',
-			'finnish' => 'fi',
-			'french' => 'fr',
-			'french_corporate' => 'fr',
-			'french_KM' => 'fr',
-			'french_org' => 'fr',
-			'french_unicode' => 'fr',
-			'friulian' => 'fur',
-			'galician' => 'gl',
-			'georgian' => 'ka',
-			'german' => 'de',
-			'greek' => 'el',
-			'hebrew' => 'he',
-			'hungarian' => 'hu',
-			'indonesian' => 'id',
-			'italian' => 'it',
-			'japanese' => 'ja',
-			'japanese_unicode' => 'ja',
-			'korean' => 'ko',
-			'latvian' => 'lv',
-			'lithuanian' => 'lt',
-			'macedonian' => 'mk',
-			'malay' => 'ms',
-			'norwegian' => 'no',
-			'occitan' => 'oc',
-			'pashto' => 'ps',
-			'persian' => 'fa',
-			'polish' => 'pl',
-			'portuguese' => 'pt',
-			'quechua_cusco' => 'qu',
-			'romanian' => 'ro',
-			'russian' => 'ru',
-			'russian_unicode' => 'ru',
-			'serbian' => 'sr',
-			'simpl_chinese' => 'zh',
-			'simpl_chinese_unicode' => 'zh',
-			'slovak' => 'sk',
-			'slovenian' => 'sl',
-			'slovenian_unicode' => 'sl',
-			'spanish' => 'es',
-			'spanish_latin' => 'es',
-			'swahili' => 'sw',
-			'swedish' => 'sv',
-			'thai' => 'th',
-			'trad_chinese' => 'zh-TW',
-			'trad_chinese_unicode' => 'zh-TW',
-			'turkish' => 'tr',
-			'ukrainian' => 'uk',
-			'vietnamese' => 'vi',
-			'yoruba' => 'yo'
-		);
-		$res = array();
-		foreach ($test_language_table as $language => $expected_result) {
-			$test_result = api_get_language_isocode($language);
-			$res[$language] = array(
-				'expected_result' => $expected_result,
-				'test_result' => $test_result,
-				'is_ok' => $expected_result === $test_result
-			);
-		}
-		$this->assertTrue(is_array($res));
-		$is_ok = true;
-		foreach ($res as $language => $test_case) {
-			$is_ok = $is_ok && $test_case['is_ok'];
-		}
-		$this->assertTrue($is_ok);
-		//var_dump($res);
-		//foreach ($res as $language => $test_case) { echo ($test_case['is_ok'] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' '.$language.' => '.(is_null($test_case['test_result']) ? 'NULL' : $test_case['test_result']).'<br />'; }
-	}
-
-	public function test_api_get_text_direction() {
-		$languages = array('english', 'en', 'arabic', 'ar');
-		$expected_results = array('ltr', 'ltr', 'rtl', 'rtl');
-		$res = array();
-		foreach ($languages as $language) {
-			$res[] = api_get_text_direction($language);
-		}
-		$this->assertTrue($res === $expected_results);
-	}
-
-	// The second function for testing api_detect_encoding().
-	public function test_api_detect_encoding_2() {
-		$string_utf8 = 'Това е тест на български език'; // Bulgarian language, UTF-8
-		$string_utf8_broken = $string_utf8.chr(198);    // Intentionaly broken UTF-8, it should be detected as UTF-8
-		$res1 = api_detect_encoding($string_utf8, 'bulgarian');
-		$res2 = api_detect_encoding($string_utf8_broken, 'bulgarian');
-		$this->assertTrue(api_is_utf8($res1) && api_is_utf8($res2));
-		//var_dump($res1);
-		//var_dump($res2);
-	}
-
-	public function test_api_get_local_time_with_datetime() {
-		$datetime_not_converted = '2010-03-13 16:24:02';
-		$datetime_gmtplus1 = api_get_local_time($datetime_not_converted, 'Europe/Paris', 'America/Lima');
-		$this->assertEqual($datetime_gmtplus1, '2010-03-13 22:24:02');
-	}
-
-	public function test_api_get_local_time_with_timestamp() {
-		$current_timestamp = time();
-		$datetime = api_get_local_time($current_timestamp, 'Europe/Paris');
-		$system_timezone = date_default_timezone_get();
-		date_default_timezone_set('Europe/Paris');
-		$this->assertEqual($datetime, date('Y-m-d H:i:s', $current_timestamp));
-		date_default_timezone_set($system_timezone);
-	}
-
-	public function test_api_get_utc_datetime_with_string() {
-		$timestamp = time();
-		$timezone = api_get_timezone();
-		$system_timezone = date_default_timezone_get();
-		date_default_timezone_set($timezone);
-		$datetime = date('Y-m-d H:i:s', $timestamp);
-		$datetime_utc = api_get_utc_datetime($datetime);
-		$this->assertEqual($datetime_utc, gmdate('Y-m-d H:i:s', $timestamp));
-		date_default_timezone_set($system_timezone);
-	}
-
-	public function test_api_get_utc_datetime_with_timestamp() {
-		$timestamp = time();
-		$this->assertEqual(api_get_utc_datetime($timestamp), gmdate("Y-m-d H:i:s", $timestamp));
-	}
-
-	/*
-	// Enable the following test when you need to run it.
-	// Testing whether all the language files load successfully. This means that their php-syntax is correct.
-	public function test_all_the_language_files() {
-		$files = array( // Only files with these names will be loaded/tested.
-			'trad4all.inc.php',
-		);
-
-		$languages = test_get_language_folder_list();
-		$lang_dir = api_get_path(SYS_LANG_PATH);
-
-		foreach ($languages as $language) {
-			echo 'Language: <strong>'.ucwords($language).'</strong><br />';
-			echo '-------------------------------------------------------------------------<br />';
-			foreach ($files as $file) {
-				echo 'Loading '.$lang_dir.$language.'/<strong>'.$file.'</strong> ...<br />';
-				test_load_php_language_file($lang_dir.$language.'/'.$file);
-			}
-			echo '<br />';
-		}
-		$this->assertTrue(true); // Once we arrived here, the test is Ok.
-	}
-	*/
-
-}
-
-
-// An isolated namespace for testing whether language files load successfully.
-function test_load_php_language_file($filename) {
-	include $filename;
-}
-
-// A helper function.
-function test_get_language_folder_list() {
-	$result = array();
-	$exceptions = array('.', '..', 'CVS', '.svn');
-	$dirname = api_get_path(SYS_LANG_PATH);
-	$handle = opendir($dirname);
-	while ($entries = readdir($handle)) {
-		if (in_array($entries, $exceptions)) {
-			continue;
-		}
-		if (is_dir($dirname.$entries)) {
-			$result[] = $entries;
-		}
-	}
-	closedir($handle);
-	sort($result);
-	return $result;
-}
-
-?>
diff --git a/tests/main/inc/lib/legal.lib.test.php b/tests/main/inc/lib/legal.lib.test.php
deleted file mode 100755
index a49abfffab..0000000000
--- a/tests/main/inc/lib/legal.lib.test.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
-
-class TestLegal extends UnitTestCase{
-
-	public function __construct() {
-		$this->UnitTestCase('Legal terms library - main/inc/lib/legal.lib.test.php');
-	}
-
-	public function testAdd(){
-		$language='english';
-		$content='english';
-		$type='';
-		$changes='';
-		$res = LegalManager::add($language, $content, $type, $changes);
-		if(is_bool($res))
-		$this->assertTrue($res === true || $res === false);
-		else
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testGetLastConditionVersion(){
-		$language='english';
-		$res = LegalManager::get_last_condition_version($language);
-		if(!is_array($res)):
-		$this->assertTrue(is_numeric($res));
-		endif;
-		//var_dump($res);
-	}
-
-	public function testGetLastCondition(){
-		$language='english';
-		$result=2;
-		$res = LegalManager::get_last_condition($language);
-		if(is_bool($res)){
-		$this->assertTrue($res===true || $res === false);
-		$this->assertTrue(is_bool($res));
-		}else{
-		$this->assertTrue(is_array($res));}
-		//var_dump($res);
-	}
-
-	public function testShowLastCondition(){
-		$term_preview=1;
-		$preview =true;
-		$res = LegalManager::show_last_condition($term_preview);
-		$this->assertTrue($res);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testGetLastVersion(){
-		$language='english';
-		$$res = LegalManager::get_last_version($language);
-		if(is_bool($res)){
-			$this->assertTrue(is_bool($res));
-			$this->assertTrue($res === true || $res === false);
-		}else{
-			$this->assertTrue(is_null($res));
-			$this->assertNull($res);
-		}
-		//var_dump($res);
-	}
-
-	public function testget_legal_data(){
-		$from='test';
-		$number_of_items=5;
-		$column=5;
-		$res = LegalManager::get_legal_data($from, $number_of_items, $column);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testCount(){
-		$res = LegalManager::count();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/login.lib.test.php b/tests/main/inc/lib/login.lib.test.php
deleted file mode 100755
index 4cea8fdd10..0000000000
--- a/tests/main/inc/lib/login.lib.test.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-require_once api_get_path(LIBRARY_PATH).'login.lib.php';
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-
-class TestLogin extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('Lost password library - main/auth/lost_password.lib.test.php');
-    }
-	/* function commented in platform code
-	function testget_email_headers(){
-		global $charset;
-		$res = get_email_headers();
- 		$this->assertTrue($res);
- 		$this->assertTrue(is_string($res));
- 		//var_dump($res);
-	}
-	*/
-
-	function testget_secret_word(){
-		global $_configuration;
-		$add='';
-		$res = Login::get_secret_word($add);
- 		// Expects an string of 32 chars
- 		$this->assertEqual(strlen($res),32);
-
- 		$this->assertTrue(is_string($res));
- 		//var_dump($res);
-	}
-
-	function testget_user_account_list(){
-		global $_configuration;
-		$user='';
-		$thisUser=array();
-		$secretword = Login::get_secret_word($thisUser["email"]);
-		$reset_link = get_lang('Pass')." : $thisUser[password]";
-		$userAccountList[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$thisUser["loginName"]."\n".get_lang('ResetLink').' : '.$reset_link.'';
-		$res = Login::get_user_account_list($user, $reset = false);
- 		$this->assertTrue(is_array($userAccountList));
- 		//var_dump($userAccountList);
-	}
-
-	function testhandle_encrypted_password() {
-		global $charset;
-		global $_configuration;
-		ob_start();
-		$user=array('abc');
-		$emailSubject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
-		$userAccountList = Login::get_user_account_list($user, true); // BODY
-		$emailTo = $user[0]["email"];
-		$secretword = Login::get_secret_word($emailTo);
-		$emailBody = get_lang('DearUser')." :\n".get_lang("password_request")."\n\n";
-		$emailBody .= "-----------------------------------------------\n".$userAccountList."\n-----------------------------------------------\n\n";
-		$emailBody .=get_lang('PasswordEncryptedForSecurity');
-		$emailBody .="\n\n".get_lang('SignatureFormula').",\n".get_lang('PlataformAdmin');
-		$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
-    	$email_admin = api_get_setting('emailAdministrator');
-		$res=Login::handle_encrypted_password($user);
-
-		if(!is_array($res))$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testreset_password(){
-		$secret='1234567891011';
-		$id=5;
-		$res=Login::reset_password($secret, $id);
-		$this->assertTrue($res);
- 		$this->assertTrue(is_string($res));
- 		//var_dump($res);
-	}
-
-	function testsend_password_to_user() {
-		$user=array();
-		ob_start();
-		$res=Login::send_password_to_user($user);
-		if(!is_null($res))$this->assertTrue(is_array($res));
-		ob_end_clean();
- 		//var_dump($res);
-	}
-}
\ No newline at end of file
diff --git a/tests/main/inc/lib/mail.lib.inc.test.php b/tests/main/inc/lib/mail.lib.inc.test.php
deleted file mode 100755
index abf3112911..0000000000
--- a/tests/main/inc/lib/mail.lib.inc.test.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-class TestMail extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Mailing library - main/inc/lib/mail.lib.inc.test.php');
-    }
-
-	function testApiMail() {
-		ob_start();
- 		$recipient_name='';
- 		$recipient_email='';
- 		$subject='';
- 		$message='';
- 		$res=@api_mail($recipient_name, $recipient_email, $subject, $message);
- 		ob_end_clean();
- 		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testApiMailHtml() {
-		ob_start();
- 		$recipient_name='';
- 		$recipient_email='';
- 		$subject='';
- 		$res=@api_mail_html($recipient_name, $recipient_email, $subject);
- 		ob_end_clean();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/main_api.lib.test.php b/tests/main/inc/lib/main_api.lib.test.php
deleted file mode 100755
index e43821ac86..0000000000
--- a/tests/main/inc/lib/main_api.lib.test.php
+++ /dev/null
@@ -1,707 +0,0 @@
-<?php
-
-use ChamiloSession as Session;
-
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
-
-class TestMainApi extends UnitTestCase {
-
-	function TestMainApi() {
-        	$this->UnitTestCase('Main API library - main/inc/lib/main_api.lib.test.php');
-	}
-/*
-	function testApiProtectCourseScript(){
-		ob_start();
-		$res= api_protect_course_script($print_headers=null);
-		ob_get_contents();
-		$this->assertTrue(is_string($res));
-		ob_end_clean();
-	}
-
-	function testApiProtectAdminScript(){
-		ob_start();
-	 	$res = api_protect_admin_script($allow_sessions_admins=false);
-	 	ob_end_clean();
-	 	//$this->assertTrue(is_string($res));
-
-	}
-
-	function testApiBlockAnonymousUser(){
-		ob_start();
-		$res = api_block_anonymous_users();
-	 	$this->assertTrue(is_string($res));
-	 	ob_end_clean();
-	}
-*/
-	function testApiGetNavigator(){
-		ob_start();
-	 	$res=api_get_navigator();
-	 	$this->assertTrue($res);
-	 	ob_end_clean();
-	}
-
-	function testApiIsSelfRegistrationAllowed(){
-		$res = api_is_self_registration_allowed();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiGetPath() {
-		$path_type = trim($path_type);
-		$path = array(
-		WEB_PATH => '',
-		SYS_PATH => '',
-		REL_PATH => '',
-		WEB_COURSE_PATH => '',
-		SYS_COURSE_PATH => '',
-		REL_COURSE_PATH => '',
-		REL_CODE_PATH => '',
-		WEB_CODE_PATH => '',
-		SYS_CODE_PATH => '',
-		SYS_LANG_PATH => 'lang/',
-		WEB_IMG_PATH => 'img/',
-		WEB_CSS_PATH => 'css/',
-		SYS_PLUGIN_PATH => 'plugin/',
-		WEB_PLUGIN_PATH => 'plugin/',
-		SYS_ARCHIVE_PATH => 'archive/',
-		WEB_ARCHIVE_PATH => 'archive/',
-		SYS_INC_PATH => 'inc/',
-		LIBRARY_PATH => 'inc/lib/',
-		CONFIGURATION_PATH => 'inc/conf/',
-		WEB_LIBRARY_PATH => 'inc/lib/',
-		WEB_AJAX_PATH => 'inc/ajax/'
-	);
-		$res=api_get_path($path_type, $path);
-	 	$this->assertTrue(is_null($res));
-	 	//var_dump($res);
-	}
-
-	function testApiGetUserId(){
-		$res= api_get_user_id();
-		$this->assertPattern('/\d/',$res);
-	}
-    function testApiGetUserCoursesReturnTrueWhenOutOfCoursesContext(){
-    	global $tbl_user;
-    	$userid=1;
-    	$fetch_session=true;
-    	$res = api_get_user_courses($userid,$fetch_session);
-    	if(!is_null($res)) :
-    	$this->assertTrue(is_array($res));
-    	endif;
-    	//var_dump($res);
-    }
-
-    function testApiGetUserInfoReturnFalseWhenOutOfUserInfoContext(){
-    	$user_id= 1;
-    	$res = api_get_user_info($user_id);
-   		$this->assertTrue(is_array($res));
-   		//var_dump($res);
-    }
-    function testApiGetUserInfoUsernameReturnTrueWhenOutOfUserInfoUsernameContext(){
-    	$res=api_get_user_info_from_username();
-    	$this->assertTrue(is_bool($res));
-    	//var_dump($res);
-    }
-    /* Causing problems for some reason on automated tests server
-    function testApiGetCourseIdReturnFalseWhenOutOfCourseIdContext(){
-        $res = api_get_course_id();
-    	$this->assertEqual($res,-1);
-    }
-    function testApiGetCoursePathReturnFalseWhenOutOfCoursePathContext(){
-        $res = api_get_course_path();
-    	$this->assertTrue(empty($res));
-    }
-    */
-    function testApiGetCourseSettingReturnFalseWhenOutOfCourseSeetingContext(){
-        global $_course;
-        $course_code = $_course;
-        $setting_name = 1;
-        $res = api_get_course_setting($setting_name, $course_code);
-        $this->assertTrue($res);
-    }
-
-    function testApiGetAnonymousId(){
-        $res = api_get_anonymous_id();
-        $this->assertTrue(is_numeric($res));
-    }
-
-    function testApiGetCidreq(){
-        $res=api_get_cidreq();
-        $this->assertTrue(is_string($res));
-    }
-
-    function testApiGetCourseInfo(){
-        ob_start();
-        $res=api_get_course_info();
-        $this->assertTrue($res);
-        ob_end_clean();
-    }
-//    function testApiSessionRegister(){
-//        $$variable[session_register]=false;
-//        global $$variable;
-//        if (!headers_sent()) {
-//            $res=Session::register($$variable, $$variable);
-//        }
-//        $this->assertTrue(is_null($res));
-//        $this->assertTrue(is_null($variable[session_register]));
-//    }
-
-	function testApiSessionClear() {
-		$variable = 'test';
-		 if (!headers_sent()) {
-			$res=Session::clear($variable);
-		 }
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testApiSessionDestroy(){
-		 if (!headers_sent()) {
-			$res=Session::destroy();
-		 }
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testApiAddUrlParamReturnsUrlWhenNoParam() {
-		global $url;
-		$res=api_add_url_param($url, null, $filter_xss=true);
-		$this->assertEqual($res,$url);
-	}
-
-	function testApiGeneratePassword() {
-		$res = api_generate_password($length = 8);
-	    $this->assertTrue(is_string($res));
-	    //var_dump($res);
-	}
-
-	function testApiCheckPassword(){
-		$password = '';
-		$res = api_check_password($password);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiClearAnonymous(){
-		global $_user;
-		$_user['user_id'] = 1;
-		$res = api_clear_anonymous($db_check=false);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-		$this->assertTrue(isset($_user['user_id'] ));
-	}
-
-	function testApiTruncStr() {
-		$text= 'test';
-		$res= api_trunc_str($text, $length = 30, $suffix = '...', $middle = false, $encoding = null);
-		$this->assertTrue(is_string($res));
-	}
-
-	function testDomesticate(){
-		$input= 'dome';
-		$res = domesticate($input);
-		$this->assertTrue($res);
-	}
-
-	function testGetStatusFromCode(){
-		$status_code = 1;
-		$res=get_status_from_code($status_code);
-		$this->assertTrue($res);
-	}
-
-
-	function testApiSetAnonymous(){
-		$res = api_set_anonymous();
-		$this->assertTrue(is_bool($res));
-	}
-
-	function testApiGetSessionId(){
-		$res = api_get_session_id();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-    }
-
-
-    function testApiGetSessionName(){
-   		$session_id='';
-   		$res = api_get_session_name($session_id);
-   		//$this->assertTrue(is_string($res));
-   		$this->assertTrue(is_null($res));
-   		//var_dump($res);
-    }
-
-   	function testAPiGetSetting(){
-   		global $variable, $_setting;
-   	    $res=api_get_setting($variable, $key= NULL);
-    	$this->assertTrue(is_null($res));
-    	//var_dump($res);
-   	}
-
-    function testApiGetSelf(){
-   		$res = api_get_self();
-    	$this->assertTrue(is_string($res));
-    	//var_dump($res);
-	}
-
-/* function deprecated
-   	function testGetLang(){
-        global $language_interface, $language_interface_initial_value, $language_file,$variable;
-   	 	$res = get_lang($variable, $notrans = 'DLTT', $language = null);
-   	 	$this->assertTrue(is_string($res));
-   	 	//var_dump($res);
-   	}
-
-   	function testGetLangToSystemEncoding(){
-		global $language, $name;
-		$res=&get_lang_to_system_encoding(& $string, $language);
-		ob_start();
-		api_disp_html_area($name, $content ='', $height='', $width='100%', $optAttrib='');
-		$res = ob_get_contents();
-		$this->assertNotEqual($res,'');
-   		ob_end_clean();
-   	}
-
-   	function testApiGetInterfaceLanguage(){
-		global $language_interface;
-		$language_interface=false;
-		ob_start();
-		$res = api_get_interface_language();
-		$res = ob_get_contents();
-		$this->assertTrue(is_string($res));
-		$this->assertTrue(isset($language_interface));
-		ob_end_clean();
-		//var_dump($res);
-   	}
-*/
-   	function testApiIsPlatformAdmin(){
-   		ob_start();
-		global $_user;
-		$_user['status']=true;
-		$allow_sessions_admins=true;
-		$res= api_is_platform_admin($allow_sessions_admins=true);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($_SESSION['is_platformAdmin']=true);
-		$this->assertTrue(isset($_user['status']));
-		ob_end_clean();
-		//var_dump($res);
-   	}
-
-   	function testApiIsAllowedToCreateCourse() {
-		$res=api_is_allowed_to_create_course();
-		if(!is_bool($res)){
-			$this->assertTrue(is_null($res));
-		}
-   	}
-
-   	function testApiIsCourseAdminIsFalseWhenNoCourseContextDefined() {
-		$res=api_is_course_admin();
-		if($_SESSION['is_courseAdmin'] === 1) {
-			$this->assertTrue($res);
-		} else {
-			$this->assertFalse($res);
-		}
-   	}
-
-    function testApiIsCourseCoach() {
-		$res=api_is_course_coach();
-		if(!is_bool($res)){
-			$this->assertTrue(is_null($res));
-		}
-   	}
-
-   	function testApiIsCoach(){
-		global $_user;
-		global $sessionIsCoach;
-		$_user['user_id']=2;
-		$sessionIsCoach=Database::store_result($result=false);
-		$res=api_is_coach();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-		$this->assertTrue($_user['user_id']);
-		$this->assertTrue(is_array($sessionIsCoach));
-		//var_dump($sessionIsCoach);
-   	}
-
-   	function testApiIsSessionAdmin(){
-		global $_user;
-		$_user['status']=true;
-		$res=api_is_session_admin();
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue(is_array($_user));
-		//var_dump($_user);
-
-    }
-
-   	function testApiDisplayToolTitle(){
-		$tit=true;
-		$titleElement['mainTitle']=$tit;
-		ob_start();
-		api_display_tool_title($titleElement);
-		$res = ob_get_contents();
-		$this->assertEqual($res,'<h3>1</h3>');
-		$this->assertTrue(isset($titleElement));
-		$this->assertTrue($titleElement['mainTitle']);
-		$this->assertPattern('/<h3>1<\/h3>/', $res);
-		ob_end_clean();
-	}
-/* This test fails but it doesn't say much anyway
-	function testApiDisplayToolViewOption(){
-		ob_start();
-		api_display_tool_view_option();
-		$res = ob_get_contents();
-		ob_end_clean();
-		$this->assertTrue(empty($res));
-	}
-*/
-
-	function testApiIsAllowedToEdit(){
-	 	$is_courseAdmin=false;
-	 	$res=api_is_allowed_to_edit($tutor=false,$scoach=false);
-	 	$this->assertTrue(is_bool($res));
-	 	$this->assertTrue(isset($is_courseAdmin));
-	}
-
-	function testApiIsAllowed(){
-	    global $_course, $_user;
-	  	$tool= 'full';
-	 	$action = 'delete';
-	 	$res=api_is_allowed($tool, $action, $task_id=0);
-	 	if(!is_bool($res)){
-	  	$this->assertTrue(is_null($res));
-	  	}
-	  	$this->assertTrue($action);
-	 	$this->assertTrue($_user['user_id']);
-	}
-
-	function testApiIsAnonymous(){
-	 	global $_user, $use_anonymous;
-	  	$_user['is_anonymous']=False;
-	 	$res=api_is_anonymous($user_id=null, $db_check=false);
-	 	$this->assertTrue(is_bool($res));
-	 	$this->assertFalse(isset($user_id));
-	 	$this->assertTrue(isset($_user['is_anonymous']));
-	 	$this->assertTrue(is_null($use_anonymous));
-	 	$this->assertTrue(is_bool($db_check));
-	 	//var_dump($db_check);
-	}
-
-	function testApiNotAllowed(){
-		ob_start();
-		//api_not_allowed($print_headers = false);
-		$res = ob_get_contents();
-		$this->assertEqual($res,'');
-		ob_end_clean();
-	}
-
-	function testApiGetItemVisibility(){
-	 	global $_course;
-	 	$tool = 'document';
-	 	$id=1;
-	 	$_course['dbName']=false;
-	 	$res =api_get_item_visibility($_course,$tool,$id);
-	 	$this->assertTrue(is_numeric($res));
-	 	$this->assertFalse(is_bool($res));
-	}
-
-	function testApiItemPropertyUpdate(){
-	  	global $_course, $tool, $item_id, $lastedit_type, $user_id;
-	  	$res=api_item_property_update($_course, $tool, $item_id, $lastedit_type, $user_id, $to_group_id = 0, $to_user_id = NULL, $start_visible = 0, $end_visible = 0);
-	 	$this-> assertTrue($res);
-	}
-
-	function testApiGetLanguagesCombo(){
-		$res=api_get_languages_combo($name="language");
-		$this->assertTrue($res);
-	}
-
-	function testApiDisplayLanguageForm(){
-		ob_start();
-		api_display_language_form($hide_if_no_choice=false);
-		$res = ob_get_contents();
-		$this->assertNotEqual($res,'');
-		ob_end_clean();
-	}
-
-	function testApiGetLanguages(){
-		$res= api_get_languages();
-		$this->assertTrue($res);
-	}
-
-	function testApiGetThemes(){
-		$cssdir= api_get_path(SYS_CSS_PATH);
-		$res=api_get_themes();
-		$this->assertTrue($res);
-		$this->assertTrue($cssdir);
-	}
-
-	function testApiMaxSortValue(){
-	    $user_course_category=1;
-	    $user_id =1;
-		$res= api_max_sort_value($user_course_category,$user_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testApiNumberOfPlugins(){
-		global $_plugins;
-		$location=2;
-		$_plugins[$location]=1;
-		$res=api_number_of_plugins($location);
-		$this->assertFalse($res);
-		$this->assertTrue($_plugins[$location]);
-	}
-
-	function testApiTimeToHms(){
-		$seconds = -1;
-		ob_start();
-		api_time_to_hms($seconds);
-		$res = ob_get_contents();
-		$this-> assertTrue(is_string($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testApiGetPermissionsForNewDirectories() {
-		$perm = trim(api_get_setting('permissions_for_new_directories'));
-		$perm = octdec(!empty($perm) ? $perm : '0777');
-		$res = api_get_permissions_for_new_directories();
-		$this->assertTrue($res === $perm);
-		//var_dump($res);
-	}
-
-	public function testApiGetPermissionsForNewFiles() {
-		$perm = trim(api_get_setting('permissions_for_new_files'));
-		$perm = octdec(!empty($perm) ? $perm : '0666');
-		$res = api_get_permissions_for_new_files();
-		$this->assertTrue($res === $perm);
-		//var_dump($res);
-	}
-
-	function testCopyr_file_to_nothing(){
-		$source = api_get_path(SYS_CODE_PATH).'admin/add_users_to_session.php';
-		$dest = '';
-		$res = copyr($source, $dest, $exclude=array(), $copied_files=array());
-		$this->assertFalse($res,'Function coyr() should have not proceeeded because of empty destination');
-		//var_dump($res);
-	}
-
-	function testApiGetVersion(){
-		global $_configuration;
-		$res = api_get_version();
-		$this->assertTrue($res);
-	}
-
-	function testApiStatusExists(){
-		$status_asked = 'user';
-		$res = api_status_exists($status_asked);
-		$this->assertTrue(is_bool($res));
-	}
-/* Fails for some reason on automated tests server
-	function testApiStatusKey(){
-		$status = 'user';
-		$res = api_status_key($status);
-		//var_dump($res);
-		$this->assertEqual($res,STUDENT);
-	}
-*/
-	function testApiGetStatusLangvars(){
-		$res = api_get_status_langvars();
-		$this->assertTrue(is_array($res));
-	}
-
-	function testApiSetSetting(){
-		ob_start();
-		$var = 0;
-		$value = 2;
-		$res = api_set_setting($var,$value,$subvar=null,$cat=null,$access_url=1);
-		$this->assertTrue(is_bool($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testApiSetSettingsCategory(){
-		$category = $_GET['category'];
-		$res = api_set_settings_category($category,$value=null,$access_url=1);
-		$this->assertTrue(is_null($category));
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-		//var_dump($category);
-	}
-
-	function testApiGetAccessUrls(){
-		$res = api_get_access_urls($from=0,$to=1000000,$order='url',$direction='ASC');
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testApiGetAccessUrl(){
-		$id=1;
-		$res = api_get_access_url($id);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testApiGetSettings(){
-		$res = api_get_settings($cat=null,$ordering='list',$access_url=1,$url_changeable=0);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testApiDeleteSetting(){
-		$v = false;
-		$res = api_delete_setting($v, $s=NULL, $a=1);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiAddSetting(){
-		$sk=null;
-		$type='textfield';
-		$c=null;
-		$title='';
-		$com='';
-		$sc=null;
-		$skt=null;
-		$a=1;
-		$v=0;
-		$va=array('val'=>10, 'var'=>'name');
-		$res= api_add_setting($va['val'],$va['var'],null,null,null,null,null,null,null,null,null);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiIsCourseVisibleForUser() {
-		global $_user, $cidReq;
-		$userid = $_user;
-		$cid = $cidReq ;
-		$res = api_is_course_visible_for_user($userid, $cid);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiIsElementInTheSession(){
-		ob_start();
-		$_tool['tool'] = 'TOOL_SURVEY';
-		$_id['element_id']=3;
-		$res = api_is_element_in_the_session($_tool['tool'], $_id['element_id'], $session_id=null);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue((isset($_tool['tool'],$_id['element_id'])));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testReplaceDangerousChar(){
-		$filename =ereg_replace("\.+$", "", substr(strtr(ereg_replace(
-	    "[^!-~\x80-\xFF]", "_", trim($filename)), '\/:*?"<>|\'',
-        /*Keep C1 controls for UTF-8 streams **/ '-----_---_'), 0, 250));
-		$res = api_replace_dangerous_char($filename);
-		$this->assertEqual($res,$filename, $message = 'no se pudo');
-	}
-
-	function testApiRequestUri(){
-		$res = api_request_uri();
-		$this->assertTrue($res);
-	}
-
-	function testApiGetCurrentAccessUrlId(){
-		$res=api_get_current_access_url_id();
-		$this->assertTrue($res);
-	}
-
-	function testApiGetAccessUrlFromUser(){
-		$user_id=1;
-		$res= api_get_access_url_from_user($user_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testApiGetStatusOfUserInCourse(){
-		$id = array(
-					'c_id'=>'1',
-					'user_id'=>'1');
-		$res=api_get_status_of_user_in_course($id['user_id'], $id['c_id']);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testApiIsInGroup(){
-		$res=api_is_in_group($group_id=null, $course_code=null);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiIsXmlHttpRequest(){
-		$res=api_is_xml_http_request();
-		$this->assertTrue(isset($res));
-	}
-
-	function testApiIsValidSecretKey(){
-		global $_configuration;
-		$key = array(
-		'original_key_secret'=>'2121212',
-		'security_key'=>'2121212');
-		$res = api_is_valid_secret_key($key['original_key_secret'],$key['security_key']);
-		$this->assertTrue($_configuration);
-		$this->assertFalse($res);
-		$this->assertTrue($key);
-		$this->assertEqual($key['original_key_secret'],$key['security_key'], $message ='%s');
-	}
-
-	function testApiIsUserOfCourse(){
-		$course_id = 1;
-		$user_id = 1;
-		$tbl_course_rel_user =false;
-		$sql='SELECT user_id FROM '.$tbl_course_rel_user.' WHERE course_code="'.Database::escape_string($course_id).'" AND user_id="'.Database::escape_string($user_id).'"';
-		$res= api_is_user_of_course($course_id, $user_id);
-		$this->assertFalse($res);
-		$this->assertFalse($tbl_course_rel_user);
-		$this->assertTrue($sql);
-	}
-
-	function testApiIsWindowsOs(){
-		$res= api_is_windows_os();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testApiResizeImage(){
-		//global $image, $target_width, $target_height;
-		$resize = array('image' =>'image.jpg', 'target_width'=>100, 'target_height'=>100);
-		$res = api_resize_image($resize['image'],$resize['target_width'],$resize['target_height']);
-		$this->assertTrue(is_array($res));
-		$this->assertWithinMargin($first = 10, $second=20,$margin=200, $message = 'no se pudo redimensionar imagen');
-		//var_dump($res);
-	}
-
-	function testApiCalculateImageSize(){
-		global $image_width, $image_height, $target_width, $target_height;
-		$result = array($image_width, $image_height);
-		$res = api_calculate_image_size($image_width, $image_height, $target_width, $target_height);
-		$this->assertTrue(is_array($res));
-		$this->assertTrue($result);
-		//var_dump($res);
-	}
-
-	function testApiGetToolsLists(){
-		$tool_list = 'false';
-		$res = api_get_tools_lists($my_tool =null);
-		$this->assertTrue(is_array($res));
-		$this->assertTrue($tool_list);
-		//var_dump($res);
-	}
-	public function TestDeleteCourse() {
-		$code = 'COURSETEST';
-		$res = CourseManager::delete_course($code);
-		$path = api_get_path(SYS_PATH).'archive';
-		if ($handle = opendir($path)) {
-			while (false !== ($file = readdir($handle))) {
-				if (strpos($file,$code)!==false) {
-					if (is_dir($path.'/'.$file)) {
-						rmdirr($path.'/'.$file);
-					}
-				}
-			}
-			closedir($handle);
-		}
-	}
-}
-?>
diff --git a/tests/main/inc/lib/main_api.lib.test_standalone.php b/tests/main/inc/lib/main_api.lib.test_standalone.php
deleted file mode 100755
index 089cc5f68c..0000000000
--- a/tests/main/inc/lib/main_api.lib.test_standalone.php
+++ /dev/null
@@ -1,515 +0,0 @@
-<?php //$id:$
-/**
- * A simple set of tests for the main API.
- * @author Ivan Tcholakov, 2009.
- * For licensing terms, see /license.txt
- */
-
-class TestMainApi extends UnitTestCase {
-
-    function TestMainApi() {
-        $this->UnitTestCase('Main API tests');
-    }
-
-    public function testApiGetPath() {
-
-        $common_paths = array(
-            WEB_PATH,
-            SYS_PATH,
-            REL_PATH,
-            WEB_COURSE_PATH,
-            SYS_COURSE_PATH,
-            REL_COURSE_PATH,
-            REL_CODE_PATH,
-            WEB_CODE_PATH,
-            SYS_CODE_PATH,
-            SYS_LANG_PATH,
-            WEB_IMG_PATH,
-            WEB_CSS_PATH,
-            SYS_PLUGIN_PATH,
-            WEB_PLUGIN_PATH,
-            SYS_ARCHIVE_PATH,
-            WEB_ARCHIVE_PATH,
-            INCLUDE_PATH,
-            LIBRARY_PATH,
-            CONFIGURATION_PATH,
-            WEB_LIBRARY_PATH
-        );
-
-        $specific_paths = array(
-            FLASH_PLAYER_AUDIO,
-            FLASH_PLAYER_VIDEO,
-            SCRIPT_SWFOBJECT,
-            SCRIPT_ASCIIMATHML,
-            DRAWING_ASCIISVG
-        );
-
-        $res = array();
-        $is_ok = array();
-        $message = array();
-        $paths = array();
-
-        $message[] = '';
-        $message[] = '<strong>A test about api_get_path()</strong>';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-
-        $message[] = '';
-        $message[] = 'Changed behaviour of the function api_get_path() after Dokeos 1.8.6.1, i.e. as of Chamilo 1.8.6.2.';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-        $message[] = 'Old behaviour (1.8.6.1) api_get_path(INCLUDE_PATH) = '.api_get_path_1_8_6_1(INCLUDE_PATH).'&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;'.'New behaviour (1.8.6.2) api_get_path(INCLUDE_PATH) = '.api_get_path(INCLUDE_PATH);
-        $message[] = '* Reason for this change: Difference here is due to the fact that the etalonic old function api_get_path() has ben moved in this file ( see api_get_path_1_8_6_1() ). Even for such rare, hypothetical cases, this widely used function should be stable. Now, after installation, the function returns results based on configuration settings only, as it should be.';
-        $message[] = '';
-        $message[] = 'Old behaviour (1.8.6.1) api_get_path(WEB_CSS_PATH) = '.api_get_path_1_8_6_1(WEB_CSS_PATH).'&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;'.'New behaviour (1.8.6.2) api_get_path(WEB_CSS_PATH) = '.api_get_path(WEB_CSS_PATH);
-        $message[] = '* This is a proposed implementation. Retrieving css paths through user\'s configuration options has not been implemented yet.';
-        $message[] = '';
-
-        $message[] = '';
-        $message[] = 'Reading common purpose paths';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-
-        foreach ($common_paths as $path) {
-
-            $test_case = "api_get_path($path)";
-            $res[$test_case] = api_get_path($path);
-            switch ($path) {
-                case INCLUDE_PATH:
-                case WEB_CSS_PATH:
-                    $is_ok[$test_case] = is_string($res[$test_case]) && !empty($res[$test_case]);
-                    break;
-                default:
-                    $is_ok[$test_case] = is_string($res[$test_case]) && !empty($res[$test_case]) && $res[$test_case] == api_get_path_1_8_6_1($path);
-            }
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : '.$test_case.' => '.$res[$test_case];
-        }
-
-        $message[] = '';
-        $message[] = '';
-        $message[] = 'Reading specific purpose paths';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-
-        foreach ($specific_paths as $path) {
-
-            $test_case = "api_get_path(TO_WEB, $path)";
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_WEB, $path);
-            $is_ok[$test_case] = is_string($res[$test_case]) && !empty($res[$test_case]);
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : '.$test_case.' => '.$res[$test_case];
-            $paths[] = $path;
-
-            $test_case = "api_get_path(TO_SYS, $path)";
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_SYS, $path);
-            $is_ok[$test_case] = is_string($res[$test_case]) && !empty($res[$test_case]);
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : '.$test_case.' => '.$res[$test_case];
-            $paths[] = $path;
-
-            $test_case = "api_get_path(TO_REL, $path)";
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_REL, $path);
-            $is_ok[$test_case] = is_string($res[$test_case]) && !empty($res[$test_case]);
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : '.$test_case.' => '.$res[$test_case];
-            $paths[] = $path;
-        }
-
-        $message[] = '';
-        $message[] = '';
-        $message[] = 'Testing path conversions';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-
-        $paths = array();
-        foreach ($common_paths as $path) {
-            $paths[] = array($path, api_get_path($path));
-        }
-        foreach ($specific_paths as $path) {
-            $paths[] = array($path, api_get_path(TO_WEB, $path));
-            $paths[] = array($path, api_get_path(TO_SYS, $path));
-            $paths[] = array($path, api_get_path(TO_REL, $path));
-        }
-
-        foreach ($paths as $path) {
-
-            $test_case = 'api_get_path(TO_WEB, '.$path[0].')';
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_WEB, $path[0]);
-            $test_case_1 = 'api_get_path(TO_WEB, \''.$path[1].'\')';
-            $res[$test_case_1] = api_get_path(TO_WEB, $path[1]);
-            $is_ok[$test_case] =
-                is_string($res[$test_case]) && !empty($res[$test_case])
-                && is_string($res[$test_case_1]) && !empty($res[$test_case_1])
-                && $res[$test_case] == $res[$test_case_1];
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : ';
-            $message[] = $test_case.' => '.$res[$test_case];
-            $message[] = $test_case_1.' => '.$res[$test_case_1];
-            $message[] = '';
-
-            $test_case = 'api_get_path(TO_SYS, '.$path[0].')';
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_SYS, $path[0]);
-            $test_case_1 = 'api_get_path(TO_SYS, \''.$path[1].'\')';
-            $res[$test_case_1] = api_get_path(TO_SYS, $path[1]);
-            $is_ok[$test_case] =
-                is_string($res[$test_case]) && !empty($res[$test_case])
-                && is_string($res[$test_case_1]) && !empty($res[$test_case_1])
-                && $res[$test_case] == $res[$test_case_1];
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : ';
-            $message[] = $test_case.' => '.$res[$test_case];
-            $message[] = $test_case_1.' => '.$res[$test_case_1];
-            $message[] = '';
-
-            $test_case = 'api_get_path(TO_REL, '.$path[0].')';
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_REL, $path[0]);
-            $test_case_1 = 'api_get_path(TO_REL, \''.$path[1].'\')';
-            $res[$test_case_1] = api_get_path(TO_REL, $path[1]);
-            $is_ok[$test_case] =
-                is_string($res[$test_case]) && !empty($res[$test_case])
-                && is_string($res[$test_case_1]) && !empty($res[$test_case_1])
-                && $res[$test_case] == $res[$test_case_1];
-            $message[] = ($is_ok[$test_case] ? '<span style="color: green; font-weight: bold;">Ok</span>' : '<span style="color: red; font-weight: bold;">Failed</span>').' : ';
-            $message[] = $test_case.' => '.$res[$test_case];
-            $message[] = $test_case_1.' => '.$res[$test_case_1];
-            $message[] = '';
-
-        }
-
-        $message[] = '';
-        $message[] = 'Random examples, check them visually';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-        $message[] = '$_SERVER[\'REQUEST_URI\'] => '.$_SERVER['REQUEST_URI'];
-        $message[] = '<strong>Note:</strong> Try some query strings. They should be removed from the results.';
-        $message[] = 'api_get_path(TO_WEB, $_SERVER[\'REQUEST_URI\']) => '.api_get_path(TO_WEB, $_SERVER['REQUEST_URI']);
-        $message[] = 'api_get_path(TO_SYS, $_SERVER[\'REQUEST_URI\']) => '.api_get_path(TO_SYS, $_SERVER['REQUEST_URI']);
-        $message[] = 'api_get_path(TO_REL, $_SERVER[\'REQUEST_URI\']) => '.api_get_path(TO_REL, $_SERVER['REQUEST_URI']);
-        $message[] = '';
-        $message[] = '__FILE__ => '.__FILE__;
-        $message[] = 'api_get_path(TO_WEB, __FILE__) => '.api_get_path(TO_WEB, __FILE__);
-        $message[] = 'api_get_path(TO_SYS, __FILE__) => '.api_get_path(TO_SYS, __FILE__);
-        $message[] = 'api_get_path(TO_REL, __FILE__) => '.api_get_path(TO_REL, __FILE__);
-        $message[] = '';
-        $message[] = '$_SERVER[\'PHP_SELF\'] => '.$_SERVER['PHP_SELF'];
-        $message[] = 'api_get_path(TO_WEB, $_SERVER[\'PHP_SELF\']) => '.api_get_path(TO_WEB, $_SERVER['PHP_SELF']);
-        $message[] = 'api_get_path(TO_SYS, $_SERVER[\'PHP_SELF\']) => '.api_get_path(TO_SYS, $_SERVER['PHP_SELF']);
-        $message[] = 'api_get_path(TO_REL, $_SERVER[\'PHP_SELF\']) => '.api_get_path(TO_REL, $_SERVER['PHP_SELF']);
-        $message[] = '';
-
-        $message[] = '';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = 'This test and changes of behaviour of api_get_path() have been done by Ivan Tcholakov, September 22, 2009.';
-        $message[] = '';
-
-        $result = !in_array(false, $is_ok);
-         $this->assertTrue($result);
-         //var_dump($res);
-         foreach ($message as $line) { echo $line.'<br />'; }
-
-         // Sample code for showing results in different context.
-         /*
-        $common_paths = array(
-            WEB_PATH,
-            SYS_PATH,
-            REL_PATH,
-            WEB_SERVER_ROOT_PATH,
-            WEB_COURSE_PATH,
-            SYS_COURSE_PATH,
-            REL_COURSE_PATH,
-            REL_CODE_PATH,
-            WEB_CODE_PATH,
-            SYS_CODE_PATH,
-            SYS_LANG_PATH,
-            WEB_IMG_PATH,
-            WEB_CSS_PATH,
-            SYS_PLUGIN_PATH,
-            WEB_PLUGIN_PATH,
-            SYS_ARCHIVE_PATH,
-            WEB_ARCHIVE_PATH,
-            INCLUDE_PATH,
-            LIBRARY_PATH,
-            CONFIGURATION_PATH,
-            WEB_LIBRARY_PATH
-        );
-
-        $specific_paths = array(
-            FLASH_PLAYER_AUDIO,
-            FLASH_PLAYER_VIDEO,
-            SCRIPT_SWFOBJECT,
-            SCRIPT_ASCIIMATHML,
-            DRAWING_ASCIISVG
-        );
-
-        $res = array();
-        $is_ok = array();
-        $message = array();
-        $paths = array();
-
-        $message[] = '';
-        $message[] = 'Reading common purpose paths';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-
-        foreach ($common_paths as $path) {
-
-            $test_case = "api_get_path($path)";
-            $res[$test_case] = api_get_path($path);
-            $message[] = $test_case.' => '.$res[$test_case];
-        }
-
-        $message[] = '';
-        $message[] = '';
-        $message[] = 'Reading specific purpose paths';
-        $message[] = '---------------------------------------------------------------------------------------------------------------';
-        $message[] = '';
-
-        foreach ($specific_paths as $path) {
-
-            $test_case = "api_get_path(TO_WEB, $path)";
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_WEB, $path);
-            $message[] = $test_case.' => '.$res[$test_case];
-            $paths[] = $path;
-
-            $test_case = "api_get_path(TO_SYS, $path)";
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_SYS, $path);
-            $message[] = $test_case.' => '.$res[$test_case];
-            $paths[] = $path;
-
-            $test_case = "api_get_path(TO_REL, $path)";
-            $test_case = str_replace(array('{', '}'), '', $test_case);
-            $res[$test_case] = api_get_path(TO_REL, $path);
-            $message[] = $test_case.' => '.$res[$test_case];
-            $paths[] = $path;
-        }
-
-        foreach ($message as $line) { echo $line.'<br />'; }
-        */
-    }
-
-    public function testApiIsInternalPath() {
-        $path1 = api_get_path(WEB_IMG_PATH);
-        $path2 = 'http://kdflskfsenfnmzsdn/fnefsdsmdsdmsdfsdcmxaddfdafada/index.html';
-        $path3 = api_get_path(TO_SYS, WEB_IMG_PATH);
-        $path4 = 'C:\Inetpub\wwwroot\fnefsdsmdsdmsdfsdcmxaddfdafada/index.html';
-        $path5 = api_get_path(TO_REL, WEB_IMG_PATH);
-        $path6 = '/fnefsdsmdsdmsdfsdcmxaddfdafada/index.html';
-        $res1 = api_is_internal_path($path1);
-        $res2 = api_is_internal_path($path2);
-        $res3 = api_is_internal_path($path3);
-        $res4 = api_is_internal_path($path4);
-        $res5 = api_is_internal_path($path5);
-        $res6 = api_is_internal_path($path6);
-        $this->assertTrue(is_bool($res1) && is_bool($res2) && is_bool($res3) && is_bool($res4) && is_bool($res5) && is_bool($res6)
-            && $res1 && !$res2 && $res3 && !$res4 && $res5 && !$res6);
-        //var_dump($res1);
-        //var_dump($res2);
-        //var_dump($res1);
-        //var_dump($res2);
-        //var_dump($res1);
-        //var_dump($res2);
-    }
-
-    public function testApiAddTrailingSlash() {
-        $string1 = 'path';
-        $string2 = 'path/';
-        $res1 = api_add_trailing_slash($string1);
-        $res2 = api_add_trailing_slash($string2);
-        $this->assertTrue(is_string($res1) && is_string($res2) && $res1 == $res2);
-        //var_dump($res1);
-        //var_dump($res2);
-    }
-
-    public function testRemoveAddTrailingSlash() {
-        $string1 = 'path';
-        $string2 = 'path/';
-        $res1 = api_remove_trailing_slash($string1);
-        $res2 = api_remove_trailing_slash($string2);
-        $this->assertTrue(is_string($res1) && is_string($res2) && $res1 == $res2);
-        //var_dump($res1);
-        //var_dump($res2);
-    }
-}
-
-/**
- *	Returns a full path to a certain Dokeos area, which you specify
- *	through a parameter.
- *
- *	See $_configuration['course_folder'] in the configuration.php
- *	to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters.
- *
- *	@param one of the following constants:
- *	WEB_SERVER_ROOT_PATH, SYS_SERVER_ROOT_PATH,
- *	WEB_PATH, SYS_PATH, REL_PATH, WEB_COURSE_PATH, SYS_COURSE_PATH,
- *	REL_COURSE_PATH, REL_CODE_PATH, WEB_CODE_PATH, SYS_CODE_PATH,
- *	SYS_LANG_PATH, WEB_IMG_PATH, GARBAGE_PATH, WEB_PLUGIN_PATH, SYS_PLUGIN_PATH, WEB_ARCHIVE_PATH, SYS_ARCHIVE_PATH,
- *	INCLUDE_PATH, WEB_LIBRARY_PATH, LIBRARY_PATH, CONFIGURATION_PATH
- *
- * 	@example assume that your server root is /var/www/ chamilo is installed in a subfolder chamilo/ and the URL of your campus is http://www.mychamilo.com
- * 	The other configuration paramaters have not been changed.
- * 	The different api_get_paths will give
- *	WEB_SERVER_ROOT_PATH	http://www.mychamilo.com/
- *	SYS_SERVER_ROOT_PATH	/var/www/ - This is the physical folder where the system Dokeos has been placed. It is not always equal to $_SERVER['DOCUMENT_ROOT'].
- * 	WEB_PATH				http://www.mychamilo.com/chamilo/
- * 	SYS_PATH				/var/www/chamilo/
- * 	REL_PATH				chamilo/
- * 	WEB_COURSE_PATH			http://www.mychamilo.com/chamilo/courses/
- * 	SYS_COURSE_PATH			/var/www/chamilo/courses/
- *	REL_COURSE_PATH			/chamilo/courses/
- * 	REL_CODE_PATH			/chamilo/main/
- * 	WEB_CODE_PATH			http://www.mychamilo.com/chamilo/main/
- * 	SYS_CODE_PATH			/var/www/chamilo/main/
- * 	SYS_LANG_PATH			/var/www/chamilo/main/lang/
- * 	WEB_IMG_PATH			http://www.mychamilo.com/chamilo/main/img/
- * 	GARBAGE_PATH
- * 	WEB_PLUGIN_PATH			http://www.mychamilo.com/chamilo/plugin/
- * 	SYS_PLUGIN_PATH			/var/www/chamilo/plugin/
- * 	WEB_ARCHIVE_PATH		http://www.mychamilo.com/chamilo/archive/
- * 	SYS_ARCHIVE_PATH		/var/www/chamilo/archive/
- *	INCLUDE_PATH			/var/www/chamilo/main/inc/
- * 	WEB_LIBRARY_PATH		http://www.mychamilo.com/chamilo/main/inc/lib/
- * 	LIBRARY_PATH			/var/www/chamilo/main/inc/lib/
- * 	CONFIGURATION_PATH		/var/www/chamilo/main/inc/conf/
- */
-function api_get_path_1_8_6_1($path_type) {
-
-    global $_configuration;
-    if (!isset($_configuration['access_url']) || $_configuration['access_url']==1 || $_configuration['access_url']=='') {
-        //by default we call the $_configuration['root_web'] we don't query to the DB
-        //$url_info= api_get_access_url(1);
-        //$root_web = $url_info['url'];
-        if(isset($_configuration['root_web']))
-            $root_web = $_configuration['root_web'];
-    } else {
-        //we look into the DB the function api_get_access_url
-        //this funcion have a problem because we can't called to the Database:: functions
-        $url_info= api_get_access_url($_configuration['access_url']);
-        if ($url_info['active']==1) {
-            $root_web = $url_info['url'];
-        } else {
-            $root_web = $_configuration['root_web'];
-        }
-    }
-
-    switch ($path_type) {     
-        case WEB_PATH :
-            // example: http://www.mychamilo.com/ or http://www.mychamilo.com/chamilo/ if you're using
-            // a subdirectory of your document root for Dokeos
-            if (substr($root_web,-1) == '/') {
-                return $root_web;
-            } else {
-                return $root_web.'/';
-            }
-            break;
-
-        case SYS_PATH :
-            // example: /var/www/chamilo/
-            if (substr($_configuration['root_sys'],-1) == '/') {
-                return $_configuration['root_sys'];
-            } else {
-                return $_configuration['root_sys'].'/';
-            }
-            break;
-
-        case REL_PATH :
-            // example: chamilo/
-            if (substr($_configuration['url_append'], -1) === '/') {
-                return $_configuration['url_append'];
-            } else {
-                return $_configuration['url_append'].'/';
-            }
-            break;
-
-        case WEB_COURSE_PATH :
-            // example: http://www.mychamilo.com/courses/
-            return $root_web.$_configuration['course_folder'];
-            break;
-
-        case SYS_COURSE_PATH :
-            // example: /var/www/chamilo/courses/
-            return $_configuration['root_sys'].$_configuration['course_folder'];
-            break;
-
-        case REL_COURSE_PATH :
-            // example: courses/ or chamilo/courses/
-            return api_get_path(REL_PATH).$_configuration['course_folder'];
-            break;
-
-        case REL_CODE_PATH :
-            // example: main/ or chamilo/main/
-            return api_get_path(REL_PATH).$_configuration['code_append'];
-            break;
-
-        case WEB_CODE_PATH :
-            // example: http://www.mychamilo.com/main/
-            return $root_web.$_configuration['code_append'];
-            break;
-
-        case SYS_CODE_PATH :
-            // example: /var/www/chamilo/main/
-            return $_configuration['root_sys'].$_configuration['code_append'];
-            break;
-
-        case SYS_LANG_PATH :
-            // example: /var/www/chamilo/main/lang/
-            return api_get_path(SYS_CODE_PATH).'lang/';
-            break;
-
-        case WEB_IMG_PATH :
-            // example: http://www.mychamilo.com/main/img/
-            return api_get_path(WEB_CODE_PATH).'img/';
-            break;
-
-        case SYS_PLUGIN_PATH :
-            // example: /var/www/chamilo/plugin/
-            return api_get_path(SYS_PATH).'plugin/';
-            break;
-
-        case WEB_PLUGIN_PATH :
-            // example: http://www.mychamilo.com/plugin/
-            return api_get_path(WEB_PATH).'plugin/';
-            break;
-
-        case GARBAGE_PATH : //now set to be same as archive
-        case SYS_ARCHIVE_PATH :
-            // example: /var/www/chamilo/archive/
-            return api_get_path(SYS_PATH).'archive/';
-            break;
-
-        case WEB_ARCHIVE_PATH :
-            // example: http://www.mychamilo.com/archive/
-            return api_get_path(WEB_PATH).'archive/';
-            break;
-
-        case INCLUDE_PATH :
-            // Generated by main/inc/global.inc.php
-            // example: /var/www/chamilo/main/inc/
-            $incpath = realpath(dirname(__FILE__).'/../');
-            return str_replace('\\', '/', $incpath).'/';
-            break;
-
-        case LIBRARY_PATH :
-            // example: /var/www/chamilo/main/inc/lib/
-            return api_get_path(INCLUDE_PATH).'lib/';
-            break;
-
-        case WEB_LIBRARY_PATH :
-            // example: http://www.mychamilo.com/main/inc/lib/
-            return api_get_path(WEB_CODE_PATH).'inc/lib/';
-            break;
-
-        case CONFIGURATION_PATH :
-            // example: /var/www/chamilo/main/inc/conf/
-            return api_get_path(INCLUDE_PATH).'conf/';
-            break;
-
-        default :
-            return;
-            break;
-    }
-}
-
-?>
diff --git a/tests/main/inc/lib/message.lib.test.php b/tests/main/inc/lib/message.lib.test.php
deleted file mode 100755
index 2a817f6173..0000000000
--- a/tests/main/inc/lib/message.lib.test.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'message.lib.php');
-
-class TestMessage extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Messages library - main/inc/lib/message.lib.test.php');
-    }
-
-	function testInboxDisplay() {
-		global $charset;
-		ob_start();
-		$res=MessageManager::inbox_display();
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testOutboxDisplay() {
-		global $charset;
-		ob_start();
-		$res=MessageManager::outbox_display();
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/notebook.lib.test.php b/tests/main/inc/lib/notebook.lib.test.php
deleted file mode 100755
index f46d5ee5ba..0000000000
--- a/tests/main/inc/lib/notebook.lib.test.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-class TestNotebook extends UnitTestCase {
-
-	public function __construct() {
-        $this->UnitTestCase('Glossary library - main/inc/lib/notebook.lib.test.php');
-		TestManager::create_test_course('COURSENOTEBOOK');
-	}
-
-    public function __destruct() {
-        TestManager::delete_test_course('COURSENOTEBOOK');
-    }
-
-	public function testJavascriptNotebookOutputsString() {
-		$res = NotebookManager::javascript_notebook(null);
-		$lang = get_lang("NoteConfirmDelete");
-		$this->assertTrue(is_string($res));
-		$this->assertPattern('/script/m',$res);
-        $this->assertPattern('/\/script/m',$res);
-	}
-
-	public function testSaveNoteIsFalseWhenNoteIsNull() {
-		$resNull = NotebookManager::save_note(null);
-		$this->assertFalse($resNull);
-    }
-
-    public function testSaveNoteIsFalseWhenNoteIsNegativeInt() {
-		$resFalse = NotebookManager::save_note(-1);
-	 	$this->assertFalse($resFalse);
-    }
-
-    public function testSaveNoteIsFalseWhenNoteIsEmptyArray() {
-	 	$res = NotebookManager::save_note(array());
-		$this->assertTrue(is_bool($res));
-	}
-
-	public function testGetNoteInformationIsFalseWhenNoteIsNull() {
-		$resNull = NotebookManager::get_note_information(null);
-	 	$this->assertFalse($resNull);
-    }
-
-    public function testGetNoteInformationIsFalseWhenNoteIsNegativeInt() {
-	 	$resFalse = NotebookManager::get_note_information(-1);
-	 	$this->assertFalse($resFalse);
-    }
-
-    public function testGetNoteInformationIsArray() {
-	 	$res = NotebookManager::get_note_information(1);
-	 	$this->assertTrue(is_array($res));
-	}
-
-	public function testUpdateNoteIsFalseWhenNoteIsNull() {
-		$resNull = NotebookManager::update_note(null);
-	 	$this->assertFalse($resNull);
-    }
-
-    public function testUpdateNoteIsFalseWhenNoteDoesNotExist() {
-	 	$resFalse = NotebookManager::update_note('char');
-	 	$this->assertFalse($resFalse);
-    }
-
-    public function testUpdateNoteIsFalseWhenNoteIsEmptyArray() {
-	 	$res = NotebookManager::update_note(array());
-	 	$this->assertFalse($res);
-	}
-
-	public function testDisplayNotes() {
-		ob_start();
-		$res = NotebookManager::display_notes();
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-	}
-
-	public function testDeleteNoteIsFalseWhenNoteIsNull() {
-		$resNull = NotebookManager::delete_note(null);
-	 	$this->assertFalse($resNull);
-    }
-
-    public function testDeleteNoteIsFalseWhenNoteIsNegative() {
-	 	$resFalse = NotebookManager::delete_note(-1);
-	 	$this->assertFalse($resFalse);
-    }
-
-    public function testDeleteNoteISFalseWhenNoteDoesNotExist() {
-	 	$res = NotebookManager::delete_note(1);
-		$this->assertFalse($res);
-	}
-}
\ No newline at end of file
diff --git a/tests/main/inc/lib/online.inc.test.php b/tests/main/inc/lib/online.inc.test.php
deleted file mode 100755
index 439cf42b13..0000000000
--- a/tests/main/inc/lib/online.inc.test.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * To can test this file you need commet the line 125 in "online.inc.php"
- */
-require_once(api_get_path(LIBRARY_PATH).'online.inc.php');
-
-class TestOnline extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Online (chat) library - main/inc/lib/online.inc.test.php');
-    }
-
-	function testLoginCheck() {
-		global $_course;
-		$uid=1;
-		$res=LoginCheck($uid);
-		$this->assertTrue(is_null($res));
-	}
-
-	function testLoginDelete() {
-		$user_id=1;
-		$res=LoginDelete($user_id);
-		$this->assertTrue(is_null($res));
-	}
-
-	function testonline_logout(){
-		global $_configuration, $extAuthSource;		
-		$res=online_logout(null, true);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testwho_is_online_in_this_course() {
-		$uid='';
-		$valid='';
-		$rarray = array();
-		$barray = array();
-		$login_user_id= '';
-		$login_date= '';
-		array_push($rarray,$barray);
-		array_push($barray,$login_user_id);
-		array_push($barray,$login_date);
-
-		$res=who_is_online_in_this_course($uid, $valid, $coursecode=null);
-		if(!empty($barray)){
-		$this->assertTrue(is_array($barray));
-		//var_dump($str);
-		} else {
-			$this->assertTrue(is_bool($barray));
-			//var_dump($rarray);
-		}
-		//var_dump($rarray);
-	}
-
-	function testwho_is_online()  {
-		$valid='';
-		$res=who_is_online($valid);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/rmdirr.lib.test.php b/tests/main/inc/lib/rmdirr.lib.test.php
deleted file mode 100755
index b52741da6c..0000000000
--- a/tests/main/inc/lib/rmdirr.lib.test.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Testing the function rmdirr() for recursive directory deletion.
- * This test is an adaptation of a published sample test.
- * @link http://aidanlister.com/2004/04/recursively-deleting-a-folder-in-php/
- * @author Aidan Lister, April, 2004
- * @author Ivan Tcholakov, September, 2009 - adaptation for the Dokeos LMS.
- */
-
-class Test_RmDirRFunction extends UnitTestCase {
-
-	function Test_RmDirRFunction() {
-        $this->UnitTestCase('Testing the function rmdirr() for recursive directory deletion');
-	}
-
-	public function test_rmdirr() {
-
-		$current_dir = dirname(__FILE__).'/';
-		$test_dir = $current_dir.'../../../../archive/'; // Write-access is needed for this directory.
-		$test_dir = realpath($test_dir).'/';
-
-		// Let us not clean backwars slashes on Windows, intentionally.
-		//$test_dir = str_replace('\\', '/', $test_dir);
-
-		// Create a directory and file tree
-		mkdir($test_dir.'testdelete');
-		mkdir($test_dir.'testdelete/one-a');
-		touch($test_dir.'testdelete/one-a/testfile');
-		mkdir($test_dir.'testdelete/one-b');
-
-		// Add some hidden files for good measure
-		touch($test_dir.'testdelete/one-b/.hiddenfile');
-		mkdir($test_dir.'testdelete/one-c');
-		touch($test_dir.'testdelete/one-c/.hiddenfile');
-
-		// Add some more depth
-		mkdir($test_dir.'testdelete/one-c/two-a');
-		touch($test_dir.'testdelete/one-c/two-a/testfile');
-		mkdir($test_dir.'testdelete/one-d/');
-
-		// Test that symlinks are not followed
-		// The function symlink() does not work on some Windows OS versions. For these cases this part of the test is skipped.
-		$function_symlink_exists = function_exists('symlink');
-		if ($function_symlink_exists) {
-			mkdir($test_dir.'testlink');
-			touch($test_dir.'testlink/testfile');
-			symlink($test_dir.'testlink/testfile', 'testdelete/one-d/my-symlink');
-			symlink($test_dir.'testlink', 'testdelete/one-d/my-symlink-dir');
-		}
-
-		// Run the actual delete
-		$status = rmdirr($test_dir.'testdelete');
-
-		// Check if we passed the test
-		if ($status === true && !file_exists($test_dir.'testdelete') && ($function_symlink_exists ? file_exists($test_dir.'testlink/testfile') : true)) {
-			//echo 'TEST PASSED';
-			$res = true;
-		} else {
-			//echo 'TEST FAILED';
-			$res = false;
-		}
-		if ($function_symlink_exists) {
-			@rmdirr($test_dir.'testlink');
-		}
-
-		// Pass the result of this test
-		$this->assertTrue($res === true);
-		//var_dump($test_dir);
-	}
-
-}
diff --git a/tests/main/inc/lib/security.lib.test.php b/tests/main/inc/lib/security.lib.test.php
deleted file mode 100755
index e8c2254e88..0000000000
--- a/tests/main/inc/lib/security.lib.test.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'security.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
-
-class TestSecurity extends UnitTestCase {
-
-	public $clean = array();
-
-    public function __construct() {
-        $this->UnitTestCase('Security library - main/inc/lib/security.lib.test.php');
-    }
-
-	function testcheck_abs_path() {
-			$abs_path='';
-			$checker_path='';
-			$res=Security::check_abs_path($abs_path,$checker_path);
-			$this->assertTrue(is_bool($res));
-			//var_dump($res);
-	}
-
-	function testcheck_rel_path() {
-			$rel_path='';
-			$checker_path='';
-			$res=Security::check_rel_path($rel_path,$checker_path);
-			$this->assertTrue(is_bool($res));
-			//var_dump($res);
-
-	}
-
-	function testcheck_token() {
-			$res=Security::check_token();
-			$this->assertTrue(is_bool($res));
-			//var_dump($res);
-	}
-
-	function testcheck_ua() {
-			$res=Security::check_ua();
-			$this->assertTrue(is_bool($res));
-			//var_dump($res);
-	}
-	function testclear_token() {
-			$res=Security::clear_token();
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	function testfilter_filename() {
-	 		$filename = 'security/.htaccess';
-	 		$res=Security::filter_filename($filename);
-			$this->assertTrue(is_string($res));
-			//var_dump($res);
-	 }
-
-	 function testget() {
-	 		$varname='';
-	 		$res=Security::get($varname);
-	 		if(!empty($res)) {
-	 				$this->assertTrue(is_string($res));
-	 		}	else {
-	 				$this->assertTrue(is_null($res));
-	 		}
-			//var_dump($res);
-	 }
-
-	 function testget_HTML_token() {
-	 		$res=Security::get_HTML_token();
-			$this->assertTrue(is_string($res));
-			//var_dump($res);
-	 }
-
-	function testget_token() {
-			$res=Security::get_token();
-			$this->assertTrue(is_string($res));
-			//var_dump($res);
-	}
-
-	function testget_ua() {
-			$res=Security::get_ua();
-			$this->assertTrue(is_null($res));
-			//var_dump($res);
-	}
-
-	function testremove_XSS() {
-			global $charset;
-			$var ='';
-			$user_status=ANONYMOUS;
-			$res=Security::remove_XSS($var,$user_status=ANONYMOUS);
-			if(!empty($res)) {
-				$this->assertTrue(is_array($res));
-			} else {
-				$this->assertTrue(is_string($res));
-			}
-			//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/session_handler.class.test.php b/tests/main/inc/lib/session_handler.class.test.php
deleted file mode 100755
index 0bab1d3c4e..0000000000
--- a/tests/main/inc/lib/session_handler.class.test.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'session_handler.class.php');
-
-class TestSessionHandler extends UnitTestCase {
-
-	var $connection;
-	var $connection_handler;
-	var $lifetime;
-	var $session_name;
-
-
-	public function TestSessionHandler(){
-		$this->UnitTestCase('Session handler library - main/inc/lib/session_handler.class.test.php');
-	}
-	function testClose() {
-		$instancia = new SessionHandler();
-		$res=$instancia->close();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testdestroy() {
-		$instancia = new SessionHandler();
-		$sess_id='';
-		$res=$instancia->destroy($sess_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testgarbage() {
-		$instancia = new SessionHandler();
-		$lifetime='';
-		$res=$instancia->garbage($lifetime);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testopen() {
-		$instancia = new SessionHandler();
-		$path='';
-		$name='';
-		$res=$instancia->open($path,$name);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testread() {
-		$instancia = new SessionHandler();
-		$sess_id='';
-		$res=$instancia->read($sess_id);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/*
-	//No se puede probar por tener el mismo nombre de la clase
-	function testsessionhandler() {
-		$instancia = new session_handler();
-		global $_configuration;
-		$res=$instancia->session_handler();
-		$this->assertTrue(is_string($res));
-		var_dump($res);
-	}
-	*/
-
-	function testsqlClose() {
-		$instancia = new SessionHandler();
-		$res=$instancia->sqlClose();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testsqlConnect() {
-		$instancia = new SessionHandler();
-		$res=$instancia->sqlConnect();
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testsqlQuery() {
-
-		global $_configuration;
-
-		$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-		$query = 'select user_id from '.$tbl_user;
-
-		$instancia = new SessionHandler();
-		$instancia->connection_handler = mysql_connect($_configuration['db_host'],
-												$_configuration['db_user'],
-												$_configuration['db_password']);
-
-		$res= $instancia->sqlQuery($query, false);
-		$this->assertTrue(is_resource($res));
-		$this->assertTrue($res);
-
-	}
-
-	function testwrite() {
-		$instancia = new SessionHandler();
-		$sess_id='';
-		$sess_value='';
-		$res=$instancia->write($sess_id,$sess_value);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/sessionmanager.lib.test.php b/tests/main/inc/lib/sessionmanager.lib.test.php
deleted file mode 100755
index f3e87852fd..0000000000
--- a/tests/main/inc/lib/sessionmanager.lib.test.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-require_once(api_get_path(LIBRARY_PATH).'sessionmanager.lib.php');
-
-class TestSessionManager extends UnitTestCase {
-
-	public function TestSessionManager(){
-		$this->UnitTestCase('Sessions manager library - main/inc/lib/sessionmanager.lib.test.php');
-	}
-	function testadd_courses_to_session() {
-		$id_session='';
-		$course_list='';
-		ob_start();
-		$res=SessionManager::add_courses_to_session($id_session,$course_list);
-		if(!empty($res)) {
-			$this->assertTrue(is_null($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-		}
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testcreate_session() {
-		global $_user;
-		$sname='';
-		$start='';
-		$end='';
-		$coachStart='';
-		$coachEnd='';
-		$nolimit='';
-		$coach_username='';
-		$id_session_category='';
-		$id_visibility='';
-		$id_session=Database::insert_id();
-		ob_start();
-		$res=SessionManager::create_session(
-            $sname,
-            $start,
-            $end,
-            $coachStart,
-            $coachEnd,
-            $nolimit,
-            $coach_username,
-            $id_session_category,
-            $id_visibility
-        );
-		$this->assertTrue(is_numeric($id_session));
-		$this->assertTrue(is_string($res));
-		ob_end_clean();
-		//var_dump($id_session);
-	}
-
-	function testcreate_session_extra_field() {
-		$fieldvarname='';
-		$fieldtype='';
-		$fieldtitle='';
-		ob_start();
-		$res=SessionManager::create_session_extra_field($fieldvarname, $fieldtype, $fieldtitle);
-		$this->assertTrue(is_numeric($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-	/*
-	//Esta prueba muestra pantallaso, lo dejo comentado
-	function testdelete_session() {
-		$idsesion = new MockDatabase();
-		$idse = new Mockapi_failure();
-		global $_user;
-		$id_checked='';
-		$this->sessionmanager = new SessionManager();
-		$res=SessionManager::delete($id_checked);
-		$idsesion->expectOnce(Database :: get_main_table(TABLE_MAIN_SESSION));
-		$this->assertTrue(is_object($idsesion));
-		$this->assertTrue(is_null($res));
-		var_dump($res);
-	}
-	*/
-
-	function testedit_session() {
-		global $_user;
-		$id=1;
-		$name='';
-		$start='';
-		$end='';
-        $coachStart='';
-        $coachEnd='';
-		$nolimit='';
-		$id_coach='';
-		$id_session_category='';
-		$id_visibility='';
-		$res=SessionManager::edit_session(
-            $id,
-            $name,
-            $start,
-            $end,
-            $coachStart,
-            $coachEnd,
-            $nolimit,
-            $id_coach,
-            $id_session_category,
-            $id_visibility
-        );
-		$this->assertTrue(is_numeric($id));
-		$this->assertTrue(is_string($res));
-		//var_dump($id);
-	}
-
-	function testget_session_by_name() {
-		$session_name='';
-		$res=SessionManager::get_session_by_name($session_name);
-		if(!is_bool($res)) $this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testrelation_session_course_exist() {
-		$session_id=1;
-		$course_id='';
-		$res=SessionManager::relation_session_course_exist($session_id, $course_id);
-		if(!is_numeric($res)) $this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testsubscribe_users_to_session() {
-		$id_session='';
-		$user_list='';
-		$res=SessionManager::subscribe_users_to_session($id_session,$user_list,$empty_users=true);
-		if(!is_null($res)) $this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testupdate_session_extra_field_value() {
-		$session_id='';
-		$fname='';
-		$fvalue='';
-		$res=SessionManager::update_session_extra_field_value($session_id,$fname,$fvalue='');
-		$this->assertTrue(is_bool($res));
-	}
-}
-?>
diff --git a/tests/main/inc/lib/social.lib.test.php b/tests/main/inc/lib/social.lib.test.php
deleted file mode 100755
index 95c43c8a12..0000000000
--- a/tests/main/inc/lib/social.lib.test.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'social.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'api.lib.php');
-
-class TestSocial extends UnitTestCase{
-    //public $social;
-
-    public function __construct() {
-        $this->UnitTestCase('Social network library - main/inc/lib/social.lib.test.php');
-    }
-/*
-	public function setUp(){
-		$this->social = new SocialManager();
-	}
-
-	public function tearDown(){
-		$this->social = null;
-	}
-	*/
-
-	public function testShowListTypeFriends(){
-		$res =SocialManager::show_list_type_friends();
-		$this->assertTrue($res);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testGetRelationTypeByName (){
-		$relation_type_name=1;
-		$res = SocialManager::get_relation_type_by_name($relation_type_name);
-		if(is_null($res))
-		{
-			$this->assertNull($res);
-			$this->assertTrue(is_null($res));
-		} else
-		  {
-			$this->assertTrue(is_numeric($res));
-			$this->assertTrue($res);
-		  }
-		//var_dump($res);
-	}
-
-	public function testGetRelationBetweenContacts (){
-		$user_id=1;
-		$user_friend=3;
-		$res =SocialManager::get_relation_between_contacts($user_id,$user_friend);
-		if(is_numeric($res)){
-			$this->assertFalse($res);
-			$this->assertTrue(is_numeric($res));
-		} else
-		  {
-			$this->assertTrue(is_string($res));
-			$this->assertTrue($res);
-		  }
-		//var_dump($res);
-
-	}
-
-	public function testGetListWebPathUserInvitationByUserId(){
-		$user_id=1;
-		$res = SocialManager::get_list_web_path_user_invitation_by_user_id($user_id);
-		if(is_array($res))
-		$this->assertTrue(is_array($res));
-		else
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testSendInvitationFriend(){
-		$user_id=1;
-		$friend_id=3;
-		$message_title='hello';
-		$message_content='hola';
-		$res = SocialManager::send_invitation_friend($user_id,$friend_id,$message_title,$message_content);
-		if(!is_null($res)):
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue(is_bool($res===true || $res === false));
-		endif;
-		//var_dump($res);
-	}
-
-	public function testGetMessageNumberInvitationByUserId(){
-		$user_receiver_id=3;
-		$res = SocialManager::get_message_number_invitation_by_user_id($user_receiver_id);
-		if(is_string($res)):
-		$this->assertTrue(is_numeric($res));
-		endif;
-		//var_dump($res);
-	}
-
-	public function testGetListInvitationOfFriendsByUserId(){
-		$user_id=1;
-		$res = SocialManager::get_list_invitation_of_friends_by_user_id($user_id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testInvitationAccepted(){
-		$user_send_id=1;
-		$user_receiver_id=3;
-		$res = SocialManager::invitation_accepted($user_send_id,$user_receiver_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testInvitationDenied(){
-		$user_send_id=1;
-		$user_receiver_id=3;
-		$res = SocialManager::invitation_denied($user_send_id,$user_receiver_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testQualifyFriend(){
-		$id_friend_qualify=2;
-		$type_qualify=1;
-		$res = SocialManager::qualify_friend($id_friend_qualify,$type_qualify);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testSendInvitationFriendUser(){
-		global $_course, $charset;
-		ob_start();
-		$userfriend_id = 1;
-		$subject_message = 'test';
-		$content_message = 'this message is a test';
-		$res = SocialManager::sendInvitationToUser ($userfriend_id,$subject_message,$content_message);
-		ob_end_clean();
-		if(is_string($res)){
-			$this->assertTrue($res);
-			$this->assertTrue(is_string($res));
-		} else {
-			$this->assertTrue(is_bool($res));
-			$this->assertTrue($res === false);
-		}
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/sortable_table.class.test.php b/tests/main/inc/lib/sortable_table.class.test.php
deleted file mode 100755
index f89a01f568..0000000000
--- a/tests/main/inc/lib/sortable_table.class.test.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-
-class TestSortableTable extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Sortabletable library - main/inc/lib/sortable_table.class.test.php');
-    }
-
-	function testdisplay() {
-		$instancia = new SortableTable();
-		global $charset;
-		ob_start();
-		$res=$instancia->display();
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testfilter_data() {
-		$instancia = new SortableTable();
-		$row=array();
-		$res=$instancia->filter_data($row);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testget_additional_url_paramstring() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_additional_url_paramstring();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_navigation_html() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_navigation_html();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_page_select_form() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_page_select_form();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_pager() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_pager();
-		$this->assertTrue(is_object($res));
-		//var_dump($res);
-	}
-
-	function testget_sortable_table_param_string() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_sortable_table_param_string();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_table_data() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_table_data();
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testget_table_html() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_table_html();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_table_title() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_table_title();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_total_number_of_items() {
-		$instancia = new SortableTable();
-		$res=$instancia->get_total_number_of_items();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testset_additional_parameters() {
-		$instancia = new SortableTable();
-		$parameters='';
-		$res=$instancia->set_additional_parameters($parameters);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testset_column_filter() {
-		$instancia = new SortableTable();
-		$column='';
-		$function='';
-		$res=$instancia->set_column_filter($column, $function);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testset_form_actions() {
-		$instancia = new SortableTable();
-		$actions='';
-		$checkbox_name = 'id';
-		$res=$instancia->set_form_actions($actions, $checkbox_name = 'id');
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testset_header() {
-		$instancia = new SortableTable();
-		$column='';
-		$label='';
-		$res=$instancia->set_header($column, $label, $sortable = true, $th_attributes = null, $td_attributes = null);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testset_other_tables() {
-		$instancia = new SortableTable();
-		$tablenames='';
-		$res=$instancia->set_other_tables($tablenames);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-}
-
-class TestSortableTableFromArray extends UnitTestCase {
-
-	function testget_table_data() {
-		$res=SortableTableFromArray::get_table_data($from=1);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testget_total_number_of_items() {
-		$res=SortableTableFromArray::get_total_number_of_items();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-}
-
-class TestSortableTableFromArrayConfig extends UnitTestCase {
-
-	public function testget_table_data() {
-		$res=SortableTableFromArray::get_table_data($from=1);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testget_total_number_of_items() {
-		$res=SortableTableFromArray::get_total_number_of_items();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/specific_fields_manager.lib.test.php b/tests/main/inc/lib/specific_fields_manager.lib.test.php
deleted file mode 100755
index 2fcad724e2..0000000000
--- a/tests/main/inc/lib/specific_fields_manager.lib.test.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');
-
-class TestSpecificFieldsManager extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Specific (extra) fields library - main/inc/lib/specific_fields_manager.lib.test.php');
-    }
-
-	function testadd_specific_field() {
-		$name='';
-		$res=add_specific_field($name);
-		if(!is_bool($res)) {$this->assertTrue(is_string($res));}
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testadd_specific_field_value() {
-		$id_specific_field='';
-		$course_id='';
-		$tool_id='';
-		$ref_id='';
-		$value='';
-		$res=add_specific_field_value($id_specific_field, $course_id, $tool_id, $ref_id, $value);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testdelete_all_specific_field_value() {
-		$course_id='';
-		$id_specific_field='';
-		$tool_id='';
-		$ref_id='';
-		$res=delete_all_specific_field_value($course_id, $id_specific_field, $tool_id, $ref_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testdelete_all_values_for_item() {
-		$course_id='';
-		$tool_id='';
-		$ref_id='';
-		$id_specific_field='';
-		$res=delete_all_specific_field_value($course_id, $id_specific_field, $tool_id, $ref_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testdelete_specific_field() {
-		$id='';
-		$res=delete_specific_field($id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testedit_specific_field() {
-		$id='';
-		$name='';
-		$res=edit_specific_field($id,$name);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_specific_field_code_from_name() {
-		$name='';
-		$res=get_specific_field_code_from_name($name);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	function testget_specific_field_list() {
-		$res=get_specific_field_list($conditions = array(), $order_by = array());
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testget_specific_field_values_list() {
-		$res=get_specific_field_values_list($conditions = array(), $order_by = array());
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testget_specific_field_values_list_by_prefix() {
-		$prefix='';
-		$course_code='';
-		$tool_id='';
-		$ref_id=1;
-		$table_sf = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-  		$table_sfv = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
-		$sql = sprintf($sql, $table_sf, $table_sfv, $prefix, $course_code, $tool_id, $ref_id);
-		$res=get_specific_field_values_list_by_prefix($prefix, $course_code, $tool_id, $ref_id);
-		$return_array = array();
-		$this->assertTrue(is_null($res));
-		$this->assertTrue(is_array($return_array));
-		//var_dump($res);
-		//var_dump($return_array);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/statsUtils.lib.inc.test.php b/tests/main/inc/lib/statsUtils.lib.inc.test.php
deleted file mode 100755
index b368e98036..0000000000
--- a/tests/main/inc/lib/statsUtils.lib.inc.test.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-class TestStatsUtils extends UnitTestCase
-{
-    public function __construct()
-	{
-        $this->UnitTestCase('Stats utilities library - main/inc/lib/statsUtil.lib.inc.test.php');
-    }
-
-	function testgetManyResults1Col() {
-		$sql='';
-		ob_start();
-		$res=StatsUtils::getManyResults1Col($sql);
-		ob_end_clean();
-		$this->assertTrue(is_string($sql));
-		//var_dump($sql);
-	}
-
-	function testgetManyResults2Col() {
-		$sql='';
-		ob_start();
-		$res=StatsUtils::getManyResults2Col($sql);
-		ob_end_clean();
-		$this->assertTrue(is_string($sql));
-		//var_dump($sql);
-	}
-
-	function testgetManyResults3Col() {
-		$sql='';
-		ob_start();
-		$res=StatsUtils::getManyResults3Col($sql);
-		ob_end_clean();
-		$this->assertTrue(is_string($sql));
-		//var_dump($sql);
-	}
-
-	function testgetManyResultsXCol() {
-		$sql='';
-		$X='';
-		ob_start();
-		$res=StatsUtils::getManyResultsXCol($sql,$X);
-		ob_end_clean();
-		$this->assertTrue(is_string($sql));
-		//var_dump($sql);
-	}
-
-	function testgetOneResult() {
-		$sql='';
-		ob_start();
-		$res=StatsUtils::getOneResult($sql);
-		ob_end_clean();
-		$this->assertTrue(is_string($sql));
-		//var_dump($sql);
-	}
-}
diff --git a/tests/main/inc/lib/surveymanager.lib.test.php b/tests/main/inc/lib/surveymanager.lib.test.php
deleted file mode 100755
index 939f101ba5..0000000000
--- a/tests/main/inc/lib/surveymanager.lib.test.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-require_once api_get_path(LIBRARY_PATH).'surveymanager.lib.php';
-//This class is deprecated
-/*
-class TestSurveyManager extends UnitTestCase {
-
-	public function TestSurveyManager(){
-		$this->UnitTestCase('Surveys library - main/inc/lib/surveymanager.lib.test.php');
-	}
-		function testcreate_survey() {
-		$surveycode='';
-		$surveytitle='';
-		$surveysubtitle='';
-		$author='';
-		$survey_language='';
-		$availablefrom='';
-		$availabletill='';
-		$isshare='';
-		$surveytemplate='';
-		$surveyintroduction='';
-		$surveythanks='';
-		$table_survey='';
-		$table_group='';
-		$res=SurveyManager::create_survey($surveycode,$surveytitle, $surveysubtitle, $author, $survey_language, $availablefrom, $availabletill,$isshare, $surveytemplate, $surveyintroduction, $surveythanks, $table_survey, $table_group);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testcreate_survey_attach() {
-		$surveycode='';
-		$surveytitle='';
-		$surveysubtitle='';
-		$author='';
-		$survey_language='';
-		$availablefrom='';
-		$availabletill='';
-		$isshare='';
-		$surveytemplate='';
-		$surveyintroduction='';
-		$surveythanks='';
-		$table_survey='';
-		$table_group='';
-		$res=SurveyManager::create_survey_attach($surveycode,$surveytitle, $surveysubtitle, $author, $survey_language, $availablefrom, $availabletill,$isshare, $surveytemplate, $surveyintroduction, $surveythanks, $table_survey, $table_group);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testattach_survey() {
-		$surveyid='';
-		$newsurveyid='';
-		$db_name='';
-		$curr_dbname='';
-		$res=SurveyManager::attach_survey($surveyid,$newsurveyid,$db_name,$curr_dbname);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testcreate_course_survey_rel() {
-		$cidReq='';
-		$survey_id='';
-		$table_course='';
-		$table_course_survey_rel='';
-		$res=SurveyManager::create_course_survey_rel($cidReq,$survey_id,$table_course,$table_course_survey_rel);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testdisplay_imported_group() {
-		$sid='';
-		$table_group='';
-		$table_question='';
-		ob_start();
-		$res=SurveyManager::display_imported_group($sid,$table_group,$table_question);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testget_all_datas() {
-		global $_course;
-		$id='';
-		$res=SurveyManager::get_all_datas($id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testget_author() {
-		$db_name='';
-		$survey_id='';
-		$res=SurveyManager::get_author($db_name,$survey_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_data() {
-		$id='';
-		$field='';
-		$res=SurveyManager::get_data($id, $field);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_groupname() {
-	    $db_name='';
-		$gid='0011';
-		$res=SurveyManager::get_groupname($db_name,$gid);
-		if(!is_null($res))$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testget_question_type() {
-		$questionid='';
-		$res=SurveyManager::get_question_type($questionid);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_status() {
-		global $_user;
-		$table_user = Database::get_main_table(TABLE_MAIN_USER);
-		$sqlm = "SELECT  status FROM  $table_user WHERE user_id = '".Database::escape_string($_user['user_id'])."'";
-		$resm = Database::query($sqlm);
-		$objm=@Database::fetch_object($resm);
-		$ss = $objm->status ;
-		$res=SurveyManager::get_status();
-		if(!$res = null ){
-		$this->assertTrue(is_null($res));
-		}else{
-		$this->assertTrue(is_string($res));
-		}
-		//var_dump($res);
-	}
-
-	function testget_survey_author() {
-		$user_table = Database :: get_main_table(TABLE_MAIN_USER);
-		$authorid = Database::escape_string($authorid);
-		$sql_query = "SELECT * FROM $user_table WHERE user_id='$authorid'";
-		$res = Database::query($sql_query);
-		$firstname=@Database::result($res,0,'firstname');
-		$res=SurveyManager::get_survey_author($authorid);
-		$this->assertTrue(is_null($firstname));
-		$this->assertNull($res);
-		//var_dump($firstname);
-	}
-
-	function testget_survey_code() {
-		$table_survey='';
-		$survey_code='';
-		$res=SurveyManager::get_survey_code($table_survey,$survey_code);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_survey_list() {
-		ob_start();
-		$res=SurveyManager::get_survey_list();
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testget_surveyid() {
-		$db_name='';
-		$group_id='';
-		$res=SurveyManager::get_surveyid($db_name,$group_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_surveyname() {
-		$db_name='';
-		$sid='';
-		$res=SurveyManager::get_surveyname($db_name,$sid);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testget_surveyname_display() {
-		$sid='';
-		$res=SurveyManager::get_surveyname_display($sid);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testimport_questions() {
-		$import_type='';
-		$ids='';
-		$res=SurveyManager::import_questions($import_type, $ids);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testinsert_into_group() {
-		$survey_id='';
-		$group_title='';
-		$introduction='';
-		$tb='';
-		$res=SurveyManager::insert_into_group($survey_id,$group_title,$introduction,$tb);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testno_of_question() {
-		$db_name='';
-		$gid='';
-		$res=SurveyManager::no_of_question($db_name,$gid);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testpick_author() {
-		$survey_id='';
-		$res=SurveyManager::pick_author($survey_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	 function testpick_surveyname() {
-	 	$sid='';
-	 	$res=SurveyManager::pick_surveyname($sid);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	function testselect_group_list() {
-		$survey_id='';
-		$seleced_groupid='';
-		$extra_script='';
-		$res=SurveyManager::select_group_list($survey_id, $seleced_groupid='', $extra_script='');
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testupdate_group() {
-	 	$groupid='';
-	 	$surveyid='';
-	 	$groupnamme='';
-	 	$introduction='';
-	 	$curr_dbname='';
-	 	$res=SurveyManager::update_group($groupid,$surveyid,$groupnamme,$introduction,$curr_dbname);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testupdate_question() {
-	 	$qid='';
-	 	$qtype='';
-	 	$caption='';
-	 	$alignment='';
-	 	$answers='';
-	 	$open_ans='';
-	 	$curr_dbname='';
-	 	$res=SurveyManager::update_question($qid,$qtype,$caption,$alignment,$answers,$open_ans,$curr_dbname);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	 }
-
-	 function testupdate_survey() {
-	 	$surveyid='';
-	 	$surveycode='';
-	 	$surveytitle='';
-	 	$surveysubtitle='';
-	 	$author='';
-	 	$survey_language='';
-	 	$availablefrom='';
-	 	$availabletill='';
-	 	$isshare='';
-	 	$surveytemplate='';
-	 	$surveyintroduction='';
-	 	$surveythanks='';
-	 	$cidReq='';
-	 	$table_course='';
-	 	$res=SurveyManager::update_survey($surveyid,$surveycode,$surveytitle, $surveysubtitle, $author, $survey_language, $availablefrom, $availabletill,$isshare, $surveytemplate, $surveyintroduction, $surveythanks, $cidReq,$table_course);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-	function testdelete_group() {
-		$group_id='';
-		$res=SurveyManager::delete_group($group_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testdelete_survey() {
-		$survey_id='';
-		$res=SurveyManager::delete_survey($survey_id);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-}
-*/
-class TestSurveyTree extends UnitTestCase {
-
-	var $surveylist;
-	var $plainsurveylist;
-	var $numbersurveys;
-	public function TestSurveTree(){
-		$this->UnitTestCase('Survey trees library - main/inc/lib/surveymanager.lib.test.php');
-	}
-	function testgetParentId() {
-		$id='';
-		$res=SurveyTree::getParentId($id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-	function testcreateList() {
-		$list=array();
-		$res=SurveyTree::createList($list);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/system_announcements.lib.test.php b/tests/main/inc/lib/system_announcements.lib.test.php
deleted file mode 100755
index 5494c75ded..0000000000
--- a/tests/main/inc/lib/system_announcements.lib.test.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'system_announcements.lib.php');
-
-class TestSystemAnnouncementManager extends UnitTestCase {
-
-    public function __construct(){
-        $this->UnitTestCase('System announcements library - main/inc/lib/system_announcements.lib.test.php');
-    }
-	function test_add_announcement() {
-		$title='Anuncio';
-		$content='Contenido del anuncio';
-		$date_start='2010-01-02';
-		$date_end='2010-01-03';
-		$visible_teacher = 0;
-		$visible_student = 0;
-		$visible_guest = 0;
-		$lang = null;
-		$send_mail=0;
-		$res=SystemAnnouncementManager::add_announcement($title, $content, $date_start, $date_end, $visible_teacher, $visible_student, $visible_guest, $lang, $send_mail);
-        $this->assertTrue(is_bool($res));
-	}
-
-	function test_count_nb_announcement() {
-		$res=SystemAnnouncementManager::count_nb_announcement($start = 0,$user_id = '');
-		$this->assertTrue(is_numeric($res));
-	}
-
-	function test_delete_announcement() {
-		$id='';
-		$res=SystemAnnouncementManager::delete_announcement($id);
-		$this->assertTrue(is_bool($res));
-	}
-
-	function test_display_all_announcements() {
-		$visible='';
-		$res=SystemAnnouncementManager::display_all_announcements($visible, $id = -1,$start = 0,$user_id='');
-		$this->assertTrue(is_null($res));
-	}
-
-	function test_display_announcements() {
-		$visible='';
-		$res=SystemAnnouncementManager::display_announcements($visible, $id = -1);
-		$this->assertNull($res);
-	}
-
-	function test_display_arrow() {
-		$user_id='';
-		$res=SystemAnnouncementManager::display_arrow($user_id);
-		$this->assertTrue(is_null($res));
-        //var_dump($res);
-	}
-
-	function test_get_all_announcements() {
-		$res=SystemAnnouncementManager::get_all_announcements();
-		$this->assertTrue(is_array($res));
-        //var_dump($res);
-	}
-
-	function test_get_announcement() {
-		$id='';
-		$res=SystemAnnouncementManager::get_announcement($id);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function test_send_system_announcement_by_email_is_true_on_teacher_null() {
-		global $_user, $_setting, $charset;
-		$title   = $content = $teacher = $student = '';
-		$res=SystemAnnouncementManager::send_system_announcement_by_email($title,$content,$teacher, $student);
-		$this->assertTrue($res);
-	}
-
-    //Test removed until we can make sure the e-mail is sent to a valid e-mail address, otherwise the function returns false because the e-mail sending fails
-    /*
-	function test_send_system_announcement_by_email_is_true_on_teacher_not_null() {
-		global $_user, $_setting, $charset;
-		$title   = 'abc';
-		$content = 'bcd';
-		$student = 0;
-		$teacher = 1;
-		$res=SystemAnnouncementManager::send_system_announcement_by_email($title,$content,$teacher, $student);
-		$this->assertTrue($res);
-	}*/
-
-	function test_set_visibility() {
-		$announcement_id = $user = $visible='';
-		$res=SystemAnnouncementManager::set_visibility($announcement_id, $user, $visible);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function test_update_announcement() {
-		$id=1;
-		$title='Anuncio';
-		$content='Contenido';
-		$date_start='2010-01-02';
-		$date_end='2010-01-03';
-		$send_mail=0;
-		ob_start();
-		$res=SystemAnnouncementManager::update_announcement($id, $title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0,$lang=null, $send_mail);
-		$this->assertTrue(is_bool($res));
-		ob_end_clean();
-        //var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/tablesort.lib.test.php b/tests/main/inc/lib/tablesort.lib.test.php
deleted file mode 100755
index 49ceca9e87..0000000000
--- a/tests/main/inc/lib/tablesort.lib.test.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-define('SORT_DATE', 3);
-define('SORT_IMAGE',4);
-
-class TestTablesort extends UnitTestCase{
-
-	//public $table;
-	public function __construct(){
-		$this->UnitTestCase('Tablesort library - main/inc/lib/tablesort.lib.test.php');
-	}
-	/*
-	public function setUp(){
-		$this->table = new TableSort();
-	}
-
-	public function tearDown(){
-		$this->table = null;
-	}
-	*/
-
-	public function testSortTable(){
-		$data= array('a', 'cd', 'efd');
-		$column = 0;
-		$direction = SORT_ASC;
-		$type = SORT_REGULAR;
-		$res =TableSort::sort_table($data, $column, $direction, $type);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-/* private method
-	public function testIsNumericColumn(){
-		$data=array('aeiou', 'abcde', 'acedrf');
-		$column=0;
-		$res = TableSort::is_numeric_column($data, $column);
-		if(!is_numeric($res)):
-		$this->assertTrue(is_bool($res));
-		endif;
-		$this->assertTrue($res === 1 || $res === 0);
-		//var_dump($res);
-	}
-	public function testIsDateColumn(){
-		$data=array();
-		$column='';
-		$res = TableSort::is_date_column($data, $column);
-		if(is_bool($res))
-		$this->assertTrue(($res));
-		else{
-		$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-	public function testIsImageColumn(){
-		$data=array();
-		$column='';
-		$res = TableSort::is_image_column($data, $column);
-		if(is_bool($res)){
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res);
-		}
-		else{
-		$this->assertTrue(is_numeric($res));
-		}
-		//var_dump($res);
-	}
-*/
-	public function testSortTableConfig(){
-		$data=array('a','b','c','d','e','z');
-		$column = 0;
-		$direction = SORT_ASC;
-		$column_show=null;
-        $column_order=null;
-		$type = SORT_REGULAR;
-		$res =  TableSort::sort_table_config($data, $column, $direction, $column_show, $column_order,$type);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/text.lib.test.php b/tests/main/inc/lib/text.lib.test.php
deleted file mode 100755
index e330a65df2..0000000000
--- a/tests/main/inc/lib/text.lib.test.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
-
-class TestText extends UnitTestCase
-{
-    public function test_api_html_to_text() {
-        $filename = api_get_path(SYS_PATH).'documentation/installation_guide.html';
-        $res = @file_get_contents($filename);
-        if ($res !== false) {
-            $res = api_html_to_text($res);
-            $this->assertTrue(is_string($res));
-        } else {
-            $this->assertTrue(true); // The file is missing, skip this test.
-        }
-        //var_dump('<pre>'.$res.'</pre>');
-    }
-
-    public function test_api_camel_case_to_underscore() {
-        $input_strings    = array('myDocuments', 'MyProfile', 'CreateNewCourse', 'Create_New_course');
-        $expected_results = array('my_documents', 'my_profile', 'create_new_course', 'create_new_course');
-        $results = array_map('api_camel_case_to_underscore', $input_strings);
-        $this->assertTrue($results == $expected_results);
-        //var_dump($results);
-    }
-
-    function test_api_underscore_to_camel_case() {
-        $input_strings     = array('my_documents', 'My_profile', 'create_new_course');
-        $expected_results1 = array('MyDocuments', 'MyProfile', 'CreateNewCourse');
-        $expected_results2 = array('myDocuments', 'MyProfile', 'createNewCourse');
-        $func = create_function('$param', 'return api_underscore_to_camel_case($param, false);');
-        $results1 = array('MyDocuments', 'MyProfile', 'CreateNewCourse');
-        $results2 = array('myDocuments', 'MyProfile', 'createNewCourse');
-        $results1 = array_map('api_underscore_to_camel_case', $input_strings);
-        $results2 = array_map($func, $input_strings);
-        $this->assertTrue($results1 == $expected_results1 && $results2 == $expected_results2);
-        //var_dump($results1);
-        //var_dump($results2);
-    }
-
-
-    function testcut() {
-        $text='';
-        $maxchar='';
-        $res=cut($text,$maxchar,$embed=false);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    function testdate_to_str_ago() {
-        $date='';
-        $res=date_to_str_ago($date);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-
-    function testfloat_format() {
-        $number='';
-        $res=float_format($number, $flag = 1);
-        if(!is_numeric($res) or !is_float($res)) {
-            $this->assertTrue(is_null($res));
-        }
-        //var_dump($res);
-    }
-
-    function testmake_clickable() {
-        $string='';
-        $res=make_clickable($string);
-        $this->assertTrue(is_string($res));
-        //var_dump($res);
-    }
-}
diff --git a/tests/main/inc/lib/tracking.lib.test.php b/tests/main/inc/lib/tracking.lib.test.php
deleted file mode 100755
index 5704509f3f..0000000000
--- a/tests/main/inc/lib/tracking.lib.test.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'tracking.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
-
-class TestTracking extends UnitTestCase {
-
-	function testget_first_connection_date() {
-		global $_user;
-		$student_id=$_user;
-		$res=Tracking::get_first_connection_date($student_id);
-	 	if(!is_bool($res)){
-	 		$this->assertTrue(is_string($res));
-	 	}
-	}
-
-	function testget_first_connection_date_on_the_course() {
-		global $_course;
-		$student_id='';
-		$course_code=$_course;
-		$res=Tracking::get_first_connection_date_on_the_course($student_id, $course_code);
-	 	if(!is_null($res))$this->assertTrue(is_bool($res));
-	 	//var_dump($res);
-	}
-
-
-	function testchat_connections_during_last_x_days_by_course() {
-	 	global $_course;
-	 	$course_code=$_course;
-		$last_days=8;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->chat_connections_during_last_x_days_by_course($course_code,$last_days);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-        //var_dump($docman);
-    }
-
-	function testcount_course_per_student() {
-		$user_id=1;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->count_course_per_student($user_id);
-		$this->assertTrue(is_object($this->tracking));
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testcount_login_per_student() {
-		$student_id=1;
-		$course_code=001;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->count_login_per_student($student_id, $course_code);
-		$this->assertTrue(is_object($this->tracking));
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testcount_number_of_forums_by_course() {
-	 	global $_course;
-	 	$course_code=$_course;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->count_number_of_forums_by_course($course_code);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testcount_number_of_posts_by_course() {
-	 	global $_course;
-	 	$course_code=$_course;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->count_number_of_posts_by_course($course_code);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testcount_number_of_threads_by_course() {
-		global $_course;
-	 	$course_code=$_course;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->count_number_of_threads_by_course($course_code);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testcount_student_assignments() {
-	 	require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
-		global $_user,$_course;
-	 	$student_id=$_user;
-	 	$course_code=$_course;
-		$a_course = CourseManager :: get_course_information($course_code);
-		$this->tracking = new Tracking();
-		$res=$this->tracking->count_student_assignments($student_id, $course_code);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testcount_student_downloaded_documents() {
-	 	global $_user,$_course;
-	 	$student_id=$_user;
-	 	$course_code=$_course;
-	 	$this->tracking = new Tracking();
-	 	$res=$this->tracking->count_student_downloaded_documents($student_id, $course_code);
-	 	$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testcount_student_messages() {
-	 	require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
-		global $_user,$_course;
-	 	$student_id=$_user;
-	 	$course_code=$_course;
-	 	$a_course = CourseManager :: get_course_information($course_code);
-
-		$res=Tracking::count_student_messages($student_id, $course_code);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testcount_student_visited_links() {
-	 	global $_user,$_course;
-	 	$student_id=$_user;
-	 	$course_code=$_course;
-	 	$this->tracking = new Tracking();
-	 	$res=$this->tracking->count_student_visited_links($student_id, $course_code);
-	 	$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-
-	 function testget_avg_student_exercise_score() {
-	 	global $_user,$_course;
-	 	$student_id=$_user;
-	 	$course_code=$_course;
-	 	$this->tracking = new Tracking();
-	 	$res=$this->tracking->get_avg_student_exercise_score($student_id, $course_code);
-	 	$this->assertTrue(is_object($this->tracking));
-		if(!is_numeric($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-	 function testget_avg_student_progress() {
-		require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
-		global $_user,$_course;
-	 	$this->tracking = new Tracking();
-	 	$res = $this->tracking->get_avg_student_progress($_user['user_id'], $_course['cidReq']);
-		$this->assertWithinMargin(0,100,$res);
-	 	$res = $this->tracking->get_avg_student_progress($_user['user_id'], $_course['cidReq'], $_SESSION['id_session']);
-		$this->assertWithinMargin(0,100,$res);
-	 	$res = $this->tracking->get_avg_student_progress(null, $_course['cidReq']);
-		$this->assertNull($res);
-		$res = $this->tracking->get_avg_student_progress(array(1,2,3), $_course['cidReq']);
-		$this->assertWithinMargin(0,100,$res);
-		// manda un usuario que no existe para entrar en condicion de retorno de 0
-		$res = $this->tracking->get_avg_student_progress(500, $_course['cidReq']);
-		$this->assertEqual(0,$res);
-	 	$res = $this->tracking->get_avg_student_progress($_user['user_id'], $_course['cidReq'], 0);
-		$this->assertWithinMargin(0,100,$res);
-	 	$res = $this->tracking->get_avg_student_progress($_user['user_id'], $_course['cidReq'], 1);
-		$this->assertWithinMargin(0,100,$res);
-	 	$res = $this->tracking->get_avg_student_progress($_user['user_id'], $_course['cidReq'], 5000);
-		$this->assertWithinMargin(0,100,$res);
-	 }
-
-	 function testget_avg_student_score() {
-	 	global $_user,$_course;
-		$student_id=$_user;
-	 	$course_code=$_course;
-	 	$res=$this->tracking->get_avg_student_score($student_id, $course_code, $lp_ids=array());
-		if(!is_string($res))$this->assertTrue(is_null($res));
-		//var_dump($res);
-	 }
-
-
-	 function testget_course_list_in_session_from_student() {
-	 	global $_user;
-		$user_id = $_user;
-	 	$session_id= 1;
-	 	$res=Tracking::get_course_list_in_session_from_student($user_id, $session_id);
-	 	$this->assertTrue(is_array($res));
-	 }
-
-
-	function testget_courses_followed_by_coach() {
-		$coach_id='';
-		$res=Tracking::get_courses_followed_by_coach($coach_id, $id_session='');
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testget_courses_list_from_session() {
-		$session_id='';
-		$res=Tracking::get_courses_list_from_session($session_id);
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testGetInactiveStudentsInCourse() {
-		global $_course;
-		$course_code = $_course;
-		$since='2010-10-02';
-		$session_id='';
-		$res=Tracking::getInactiveStudentsInCourse($course_code, $since, $session_id);
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testget_sessions_coached_by_user() {
-		$coach_id='';
-		$res=Tracking::get_sessions_coached_by_user($coach_id);
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testget_student_followed_by_coach() {
-		$coach_id='';
-		$res=Tracking::get_student_followed_by_coach($coach_id);
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testget_student_followed_by_coach_in_a_session() {
-		$id_session='';
-		$coach_id='';
-		$res=Tracking::get_student_followed_by_coach_in_a_session($id_session, $coach_id);
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testget_student_followed_by_drh() {
-		$hr_dept_id='';
-		$res=Tracking::get_student_followed_by_drh($hr_dept_id);
-	 	if(!is_null($res))$this->assertTrue(is_array($res));
-	 	//var_dump($res);
-	}
-
-	function testget_time_spent_on_the_course() {
-		$user_id='';
-		$course_code='';
-		$res=Tracking::get_time_spent_on_the_course($user_id, $course_code);
-	 	if(!is_null($res))$this->assertTrue(is_numeric($res));
-	 	//var_dump($res);
-	}
-
-	function testget_time_spent_on_the_platform(){
-		$user_id='';
-		$res=Tracking::get_time_spent_on_the_platform($user_id);
-	 	if(!is_null($res))$this->assertTrue(is_numeric($res));
-	 	//var_dump($res);
-	}
-
-	function testis_allowed_to_coach_student() {
-		$coach_id='';
-		$student_id='';
-		$res=Tracking::is_allowed_to_coach_student($coach_id, $student_id);
-	 	if(!is_null($res))$this->assertTrue(is_bool($res));
-	 	//var_dump($res);
-	}
-
-	function testchat_last_connection() {
-		require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
-		global $_course;
-		$student_id= $_POST['student_id'];
-		$course_code= $_course;
-		$this->tracking = new Tracking();
-		$res=$this->tracking->chat_last_connection($student_id,$course_code);
-		$this->assertTrue(is_object($this->tracking));
-		if(!is_string($res))$this->assertTrue(is_null($res));
-	}
-
-		function testget_last_connection_date() {
-		$student_id=1;
-		$res=Tracking::get_last_connection_date($student_id);
-	 	if(!is_bool($res))$this->assertTrue(is_string($res));
-	}
-
-	function testget_last_connection_date_on_the_course() {
-		$student_id='';
-		$course_code='';
-		$res=Tracking::get_last_connection_date_on_the_course($student_id, $course_code);
-	 	if(!is_null($res))$this->assertTrue(is_bool($res));
-	 	//var_dump($res);
-	}
-}
-
-class TestTrackingCourseLog extends UnitTestCase {
-
-
-	function testCountItemResources() {
-		//ob_start();
-		$res = TrackingCourseLog::count_item_resources();
-		$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testDisplayAdditionalProfileFields() {
-		//ob_start();
-		$res = TrackingCourseLog::display_additional_profile_fields();
-		$this->assertTrue(is_string($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testGetAddtionalProfileInformationOfFieldByUser() {
-		//ob_start();
-		$field_id=1;
-		$users=array(1,2,3);
-		$res = TrackingCourseLog::get_addtional_profile_information_of_field_by_user($field_id, $users);
-		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testGetItemResourcesData() {
-		//ob_start();
-		$from=3;
-		$number_of_items=2;
-		$column=1;
-		$direction='ASC';
-		$res = TrackingCourseLog::get_item_resources_data($from, $number_of_items, $column, $direction);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testGetNumberOfUsers() {
-		//ob_start();
-		$res = TrackingCourseLog::get_number_of_users();
-		$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testGetToolNameTable() {
-		//ob_start();
-		$tool='';
-		$res = TrackingCourseLog::get_tool_name_table($tool);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testGetUserData() {
-		//ob_start();
-		$from='';
-		$number_of_items='';
-		$column='';
-		$direction='';
-		$res = TrackingCourseLog::get_user_data($from, $number_of_items, $column, $direction);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-}
-
-class TestTrackingUserLog extends UnitTestCase {
-
-	function testDisplayDocumentTrackingInfo() {
-		ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLog::display_document_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayExerciseTrackingInfo() {
-		ob_start();
-		$view = '';
-		$user_id = 1;
-		$courseCode = 'TEST';
-		$res = TrackingUserLog::display_exercise_tracking_info($view, $user_id, $courseCode);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayLinksTrackingInfo() {
-		ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLog::display_links_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayLoginTrackingInfo() {
-		ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLog::display_login_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayStudentPublicationsTrackingInfo() {
-		ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLog::display_student_publications_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-}
-
-class TestTrackingUserLogCSV extends UnitTestCase {
-
-	function testDisplayDocumentTrackingInfo() {
-		//ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLogCSV::display_document_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayExerciseTrackingInfo() {
-		//ob_start();
-		$view = '';
-		$user_id = 1;
-		$courseCode = 'TEST';
-		$res = TrackingUserLogCSV::display_exercise_tracking_info($view, $user_id, $courseCode);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	function testDisplayLinksTrackingInfo() {
-		//ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLogCSV::display_links_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayLoginTrackingInfo() {
-		//ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLogCSV::display_login_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	function testDisplayStudentPublicationsTrackingInfo() {
-		//ob_start();
-		$view = '';
-		$user_id = 1;
-		$course_id = 1;
-		$res = TrackingUserLogCSV::display_student_publications_tracking_info($view, $user_id, $course_id);
-		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/urlmanager.lib.test.php b/tests/main/inc/lib/urlmanager.lib.test.php
deleted file mode 100755
index 66293b85a7..0000000000
--- a/tests/main/inc/lib/urlmanager.lib.test.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-require_once(api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
-
-class TestUrlManager extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('URL manager library - main/inc/lib/urlmanager.lib.test.php');
-    }
-
-	function testadd() {
-		$url='';
-		$description='';
-		$active='';
-		$res=UrlManager::add($url, $description, $active);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function testadd_course_to_url() {
-		$course_code=1;
-		$res=UrlManager::add_course_to_url($course_code, $url_id=1);
-		$this->assertTrue(is_bool($res));
-       	//var_dump($res);
-	}
-
-	function testadd_courses_to_urls() {
-		$url_list='';
-		$course_list='';
-		$res=UrlManager::add_courses_to_urls($course_list,$url_list);
-		$this->assertTrue(is_array($res));
-        //var_dump($res);
-	}
-
-	function testadd_user_to_url() {
-		$user_id=1;
-		$url_id=1;
-		$res=UrlManager::add_user_to_url($user_id, $url_id);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function testadd_users_to_urls()  {
-		$user_list='';
-		$url_list='';
-		$res=UrlManager::add_users_to_urls($user_list, $url_list);
-		$this->assertTrue(is_array($res));
-        //var_dump($res);
-	}
-
-	function testdelete() {
-		$id='';
-		$res=UrlManager::delete($id);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function testdelete_url_rel_course() {
-		$course_code='';
-		$url_id='';
-		$res=UrlManager::delete_url_rel_course($course_code, $url_id);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function testdelete_url_rel_user() {
-		$user_id='';
-		$url_id='';
-		$res=UrlManager::delete_url_rel_user($user_id, $url_id);
-		$this->assertTrue(is_bool($res));
-        //var_dump($res);
-	}
-
-	function testget_access_url_from_user() {
-		$user_id='';
-		$res=UrlManager::get_access_url_from_user($user_id);
-		$this->assertTrue(is_array($res));
-        //var_dump($res);
-	}
-
-	function testget_url_data() {
-		$res=UrlManager::get_url_data();
-		$this->assertTrue(is_array($res));
-        //var_dump($res);
-	}
-
-	function testget_url_data_from_id() {
-		$url_id=1;
-		$resu=UrlManager::get_url_data_from_id($url_id);
-		$this->assertTrue(is_array($resu));
-		//var_dump($resu);
-	}
-
-	function testget_url_id() {
-		$url='';
-		$resu=UrlManager::get_url_id($url);
-		$this->assertTrue(is_string($resu));
-		//var_dump($resu);
-	}
-
-	function testget_url_rel_course_data() {
-		$resu=UrlManager::get_url_rel_course_data($access_url_id='');
-		$this->assertTrue(is_array($resu));
-		//var_dump($resu);
-	}
-
-	function testget_url_rel_session_data() {
-		$resu=UrlManager::get_url_rel_session_data($access_url_id='');
-		$this->assertTrue(is_array($resu));
-		//var_dump($resu);
-	}
-
-	function testget_url_rel_user_data() {
-		$resu=UrlManager::get_url_rel_user_data($access_url_id='');
-		$this->assertTrue(is_array($resu));
-		//var_dump($resu);
-	}
-
-	function testrelation_url_course_exist() {
-		$course_id = 'COURSETEST';
-		$url_id=1;
-		$resu=UrlManager::relation_url_course_exist($course_id, $url_id);
-		if(!is_numeric($resu)){
-			$this->assertTrue(is_bool($resu));
-		}
-		//var_dump($resu);
-	}
-
-	function testrelation_url_user_exist() {
-		$user_id=1;
-		$url_id=1;
-		$res=UrlManager::relation_url_user_exist($user_id, $url_id);
-		if(!is_numeric($res)){
-			$this->assertTrue(is_bool($res));
-		}
-		//var_dump($res);
-	}
-
-	function testset_url_status() {
-		$status='';
-		$url_id='';
-		$res=UrlManager::set_url_status($status, $url_id);
-		if(!is_bool($res)) $this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testupdate() {
-		$url_id='';
-		$url='';
-		$description='';
-		$active='';
-		$res=UrlManager::update($url_id, $url, $description, $active);
-		if(!is_null($res))$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	function testupdate_urls_rel_course() {
-		$course_list=array();
-		$access_url_id=1;
-		$res=UrlManager::update_urls_rel_course($course_list,$access_url_id);
-		if(!is_null($res)) $this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	function testupdate_urls_rel_user() {
-		$user_list=array();
-		$access_url_id=1;
-		$res=UrlManager::update_urls_rel_user($user_list,$access_url_id);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testurl_count() {
-		$res=UrlManager::url_count();
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testurl_exist() {
-		$url='';
-		$res=UrlManager::url_exist($url);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	function testurl_id_exist() {
-		$url='';
-		$res=UrlManager::url_id_exist($url);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/usermanager.lib.test.php b/tests/main/inc/lib/usermanager.lib.test.php
deleted file mode 100755
index 1e3921c6e6..0000000000
--- a/tests/main/inc/lib/usermanager.lib.test.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-//require_once('../../../simpletest/autorun.php');
-require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
-
-class TestUserManager extends UnitTestCase {
-        public function __construct() {
-            $this->UnitTestCase('User Manager library - main/inc/lib/usermanager.lib.test.php');
-        }
-    	public function testCreateUser() {
-	    	$firstName='test_first';
-	    	$lastName='test_last';
-	    	$status='1';
-	    	$email='test@chamilo.org';
-	    	$loginName='testlogin';
-	    	$password='testlogin';
-    		$official_code='testcode';
-    		$language='english';
-    		$phone = '';
-    		$picture_uri ='';
-    		global $_user;
-    		ob_start();
-    		$res= ob_get_contents();
-    		UserManager::create_user($firstName, $lastName, $status, $email, $loginName, $password, $official_code, $language, $phone, $picture_uri);
-    		ob_end_clean();
-        	$this->assertTrue(is_string($res));
-    	}
-/*
-    function testDeleteUserReturnsTrue() {
-        $user = array('username' => 'ywarnier',
-        			  'pass' => 'ywarnier',
-      				  'firstname' => 'Yannick',
-     				  'lastname' => 'Warnier',
-      				  'status' => 6,
-     				  'auth_source' => 'platform',
-     				  'email' => 'yannick.warnier@testdokeos.com',
-     				  'creator_id' => 1,
-      				  'active' => 1,
-        			 );
-        $res = UserManager::create_user($user['firstname'],$user['lastname'],$user['status'],$user['email'],$user['username'],$user['pass'],null,null,null,null,$user['auth_source'],null,$user['active']);
-        $res = UserManager::delete_user($res);
-        $this->assertTrue($res);
-    }
-*/
-    function testDeleteUser() {
-    	$user_id='';
-    	$res = UserManager::delete_user($user_id);
-    	$this->assertTrue(is_bool($res));
-    	$_configuration['user_id']='';
-    	$res1= UserManager::delete_user($_configuration['user_id']);
-    	$this->assertTrue(is_bool($res1));
-    	//var_dump($res1);
-    }
-    /*
-    function testUpdateUser() {
-		$user = array('username' => 'ywarnier',
-	    			  'pass' => 'ywarnier',
-	    			  'firstname' => 'Yannick',
-	    			  'lastname' => 'Warnier',
-	    			  'status' => 6,
-	    			  'auth_source' => 'platform',
-	   				  'email' => 'yannick.warnier@testdokeos.com',
- 			          'creator_id' => 1,
-	  				  'active' => 1,
-					 );
-
-		$update = array('user_id'=>'12',
-					    'firstname'=>'Ricardo',
-  						'lastname'=>'Rodriguez',
-						'username'=>'richi',
-						'email'=>'xxxx@xxxx.com',
-						'status'=>6,
-						'official_code'=>'2121',
-						'phone'=>'',
-						'picture_uri'=>'',
-						'expiration_date'=>'',
-						'active'=>1
-					   );
-
-		$res = UserManager::create_user($user['firstname'],$user['lastname'],$user['status'],$user['email'],$user['username'],$user['pass'],null,null,null,null,$user['auth_source'],null,$user['active']);
-		$this->assertTrue(is_bool($res));
-		$res = UserManager::update_user($update['user_id'],$update['firstname'],$update['lastname'],$update['username'],null,null,$update['email'],$update['status'],$update['official_code'],$update['phone'],
-										$update['picture_uri'],$update['expiration_date'],$update['active'],null,null,null,null);
-		$this->assertTrue($res);
-		$res=UserManager::delete_user($res);
-		$this->assertTrue(is_bool($res));
-	}*/
-	/*
-    function testCreateExtraField() {
-    	$extra = array('fieldvarname' =>'nuevo campo',
-					   'fieldtype' => '2',
-					   'fieldtitle' => 'english',
-                       'fielddefault' => 'default'
-                      );
-    	$res = UserManager::create_extra_field($extra['fieldvarname'],$extra['fieldtype'],$extra['fieldtitle'],$extra['fielddefault'],null);
-    	$this->assertTrue('/\d/',$res);
-    }*/
-    function testCreateExtraField() {
-    	$fieldvarname='nuevo campo';
-    	$fieldtype='1';
-    	$fieldtitle='english';
-    	$fielddefault='5';
-    	$res=UserManager::create_extra_field($fieldvarname, $fieldtype, $fieldtitle, $fielddefault,null);
-    	//var_dump($res);
-    	$this->assertTrue(is_numeric($fieldtype));
-    }
-
-    function testCanDeleteUser() {
-    	$res=UserManager::can_delete_user(1);
-    	$this->assertTrue(is_bool($res));
-    }
-
-    function testAddApiKey() {
-      	$res=UserManager::add_api_key();
-    	$this->assertTrue(is_bool($res));
-    }
-
-    function testBuildProductionListIsFalse() {
-    	$res = UserManager::build_production_list(1, false, false);
-    	$this->assertFalse($res);
-    }
-
-	function testDeleteApiKey() {
-		$res=UserManager::delete_api_key(1);
-		//var_dump($res);
-		$this->assertTrue(is_bool($res));
-	}
-
-	function testGetApiKeyIdEmptyServiceReturnsFalse() {
-		$api_service = '';
-		$res = UserManager::get_api_key_id(1,$api_service);
-		$this->assertFalse($res);
-	}
-	function testGetApiKeyIdNonEmptyServiceWithExtremeUserIdReturnsFalse() {
-		$api_service = '';
-		$res = UserManager::get_api_key_id(5000000,$api_service);
-		$this->assertFalse($res);
-	}
-
-	function testGetApiKeys() {
-		$res=UserManager::get_api_keys();
-		$this->assertTrue(is_bool($res));
-	}
-
-	function testGetExtraFieldInformation() {
-		$res=UserManager::get_extra_field_information(1);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetExtraFieldInformationByName() {
-		$sql="SELECT 1";
-		$field_variable=Database::query($sql);
-		$res=UserManager::get_extra_field_information_by_name($field_variable);
-		//var_dump($res);
-		$this->assertTrue(is_bool($res));
-	}
-
-	function testGetEextraFields() {
-		$res=UserManager::get_extra_fields(0, 0, 5, 'ASC', true);
-		$this->assertTrue($res);
-	}
-
-	function testGetExtraUserData() {
-		$res=UserManager::get_extra_user_data(1, null,null,null);
-		$this->assertTrue(is_array($res),'Somehow there were no visible fields for user 1');
-        //since Chamilo 1.8.8 we always have 3 visible fields for notifications
-	}
-
-	function testGetExtraUserDataByField() {
-		$res=UserManager::get_extra_user_data_by_field(1, 'field variable', null,null, null);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetExtraUserDataByValue(){
-		$res=UserManager::get_extra_user_data_by_value('able', 45, null);
-		$this->assertTrue(is_array($res));
-	}
-
-
-	function testGetNumberOfUsers() {
-		$res=UserManager::get_number_of_users();
-		$this->assertFalse(!(bool)$res);
-	}
-
-	function testGetPersonalSessionCourseList() {
-		global $_configuration;
-		$res=UserManager::get_personal_session_course_list(1);
-		//var_dump($res);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetPictureUser() {
-		$res=UserManager::getUserPicture(1, 'unknown.jpg');
-		$this->assertFalse(!(bool)$res);
-	}
-
-	function testGetUserIdFromUsername() {
-		$res=UserManager::get_user_id_from_username('arthur3');
-		$this->assertTrue(!(bool)$res);
-	}
-
-	function testGetUserList() {
-		$res=UserManager::get_user_list(null,null);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetUserListLike() {
-		$res=UserManager::get_user_list_like(null,null);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetUserPicturePathById() {
-		$id=5;
-		$res=UserManager::get_user_picture_path_by_id($id,null,null);
-		$this->assertTrue(is_array($res));
-	}
-
-	function testGetUserProductions() {
-		$user_id='1';
-		$res=UserManager::get_user_productions($user_id);
-		$this->assertFalse(is_array($res===0));
-	}
-
-	function testGetUserUploadFilesByCourse() {
-		$user_id='1';
-		$course='MATH';
-		$res=UserManager::get_user_upload_files_by_course($user_id, $course,null);
-		$this->assertTrue(is_string($res));
-	}
-
-	 function testIsAdmin() {
-	 	$user_id=1;
-	 	$res=UserManager::is_admin($user_id);
-	 	//var_dump($res);
-	 	$this->assertTrue(is_bool($res));
-	 }
-
-	 function testIsExtraFieldAvailable() {
-	 	$fieldname='name3';
-	 	$res=UserManager::is_extra_field_available($fieldname);
-	 	$this->assertFalse(is_string($res));
-	 }
-
-	 function testIsUsernameAvailable() {
-	 	$username='Arthur';
-	 	$res=UserManager::is_username_available($username);
-	 	$this->assertFalse(is_string($res));
-	 }
-
-	 function testRemoveUserProductionIsFalseWhenProductionDoesNotExist() {
-	 	$user_id=1;
-	 	$production='my_files/abc'; //shouldn't exist
-	 	$res=UserManager::remove_user_production($user_id,$production);
-	 	$this->assertFalse($res);
-	 }
-
-	function testResizePictureEmptyPicture() {
-		$file='';
-		$max_size_for_picture='';
-		$res=UserManager::resize_picture($file, $max_size_for_picture);
-	 	$this->assertNull($res);
-	}
-
-
-	function testSendMessageInOutbox() {
-		$email_administrator='arthur@dokeos.com';
-		$user_id='1';
-		$title='hola í';
-		$content='prueba de este í mensaje';
-		global $charset;
-		$res=UserManager::send_message_in_outbox($email_administrator,$user_id,$title, $content);
-	 	$this->assertNull($res);
-	 	$this->assertTrue(is_null($res));
-
-	}
-/*
-//DEPRECATED
-	function testSuscribeUsersToSession() {
-	  	$id_session=1;
-	  	$UserList='';
-	  	$res=UserManager::subscribe_users_to_session($id_session,$UserList);
-	 	$this->assertTrue(is_null($res));
-	}
-*/
-	function testUpdateApiKey() {
-		$user_id=121;
-		$api_service='string';
-		$res=UserManager::update_api_key($user_id,$api_service);
-	 	$this->assertTrue(is_numeric($user_id),is_string($api_service));
-	 	$this->assertTrue(is_numeric($res));
-	 	$this->assertTrue($this->$res===null);
-	 	$this->assertNull(null,$res);
-	}
-
-	function testUpdateExtraFieldValue() {
-		$user_id='121';
-		$fname='name';
-		$res=UserManager::update_extra_field_value($user_id,$fname,null);
-	 	$this->assertTrue(is_bool($res));
-	}
-
-	function testUpdateOpenid() {
-		$user_id='121';
-		$openid='default';
-		$res=UserManager::update_openid($user_id, $openid);
-	 	$this->assertTrue(is_bool($res));
-	}
-}
diff --git a/tests/main/inc/lib/xht.lib.test.php b/tests/main/inc/lib/xht.lib.test.php
deleted file mode 100755
index f467bd413b..0000000000
--- a/tests/main/inc/lib/xht.lib.test.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class TestXht extends UnitTestCase {
-
-	public $xhtdoc;
-	public function TestXht(){
-		$this->UnitTestCase('test the library that define xht_htmlwchars & class xhtdoc with methods');
-	}
-	public function setUp(){
-		$this->xhtdoc = new xhtdoc();
-	}
-
-	public function tearDown(){
-		$this->xhtdoc = null;
-	}
-
-	public function testXhtHtmlwchars(){
-		global $charset;
-		$s='';
-		$res = xht_htmlwchars($s);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXhtIsAssoclist(){
-		$s ='';
-		$res = xht_is_assoclist($s);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res === false);
-		//var_dump($res);
-	}
-
-	public function testXhtExplodeAssoclist(){
-		$S =array(aaasasa);
-		$res = xht_explode_assoclist($S);
-		if(is_array($res))
-		$this->assertTrue(is_array($res));
-		else
-		$this->assertFalse(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testXhtFillTemplate(){
-		$template_name=null;
-		$cur_elem = 0;
-		$res = xhtdoc::xht_fill_template($template_name, $cur_elem);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testxhtSubstitute(){
-		global $charset;
-		$subtext='';
-		$cur_elem = 0;
-		$pre = '';
-		$post = '';
-		$res = xhtdoc::xht_substitute($subtext, $cur_elem = 0, $pre = '', $post = '');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXhtAddTemplate(){
-		$template_name='';
-		$httext='';
-		$res = xhtdoc::xht_add_template($template_name, $httext);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testXhtdoc(){
-		$htt_file_contents='document';
-		$res = xhtdoc::xhtdoc($htt_file_contents);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testShowParam(){
-		global $charset;
-		$result = '';
-		$res = xhtdoc::_show_param();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main/inc/lib/xmd.lib.test.php b/tests/main/inc/lib/xmd.lib.test.php
deleted file mode 100755
index 4961fc4207..0000000000
--- a/tests/main/inc/lib/xmd.lib.test.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-class TestXmd extends UnitTestCase{
-
-	public $Xmddoc;
-	public function TestXmddoc(){
-
-		$this->UnitTestCase('XML Dom Library function tests');
-	}
-
-	public function setUp(){
-		$this->Xmddoc = new xmddoc();
-	}
-
-	public function tearDown(){
-		$this->Xmddoc= null;
-	}
-
-	public function testXmdGetElement(){
-		$parent=0;
-		array('?name' => $this->name[$parent],
-              '?parent' => $this->parent[$parent]);
-		$res = $this->Xmddoc->xmd_get_element($parent);
-		if(!is_array($res))
-		$this->assertTrue(is_null($res));
-		else
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testXmdGetNsUri(){
-		$parent = 0;
-		$attName = '';
-		$this->names[$this->ns[$parent]];
-		$res = Xmddoc::xmd_get_ns_uri($parent = 0, $attName = '');
-		if(is_array($res))
-		$this->assertTrue(is_array($res));
-		else
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testXmdRemoveElement(){
-		$child='';
-		$res = Xmddoc:: xmd_remove_element($child);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res ===false);
-		//var_dump($res);
-	}
-
-	public function testXmdRemoveNodes(){
-		$children=2;
-		$parent = 1;
-		$res = Xmddoc::xmd_remove_nodes($children, $parent = 0);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res === false);
-		//var_dump($res);
-	}
-	/**
-	 *
-	 */
-	public function testXmdUpdate(){
-		$xmPath='';
-		$text = '';
-		$parent = 0;
-		$res = $this->Xmddoc->xmd_update($xmPath, $text, $parent);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res === false);
-		//var_dump($res);
-	}
-	/**
-	 * this function have work with the method xmddoc
-	 */
-	public function testXmdUpdateMany(){
-		$xmPaths='';
-		$subPath='';
-		$text='';
-		$parent='';
-		$res = $this->Xmddoc->xmd_update_many($xmPaths, $subPath, $text, $parent);
-		$this->assertTrue($res);
-		//var_dump($res);
-	}
-
-	public function testXmdCopyForeignChild(){
-		$fdoc='';
-		$fchild='';
-		$parent='';
-		$res = $this->Xmddoc->xmd_copy_foreign_child($fdoc, $fchild, $parent);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	public function testXmdAddElement(){
-		$name='asasasas';
-		$parent = 0;
-		$attribs = array();
-		$res  = $this->Xmddoc->xmd_add_element($name, $parent, $attribs);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res === -1 || $res === 0);
-		//var_dump($res);
-	}
-
-	public function testXmdSetAttribute(){
-		$parent=0;
-		$name='';
-		$value=0;
-		$checkurihaspfx = TRUE;
-		$res = $this->Xmddoc->xmd_set_attribute($parent, $name, $value, $checkurihaspfx);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXmdAddText(){
-		$text='asasasasasa';
-		$parent = 1;
-		$res = $this->Xmddoc->xmd_add_text($text, $parent = 0);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res === false);
-		//var_dump($res);
-	}
-
-	public function testXmdAddTextElement(){
-		$name='';
-		$text='';
-		$parent = 0;
-		$attribs = array();
-		$res = $this->Xmddoc->xmd_add_text_element($name, $text, $parent = 0, $attribs = array());
-		$this->assertTrue(is_bool($res) || is_numeric($res));
-		//var_dump($res);
-	}
-
-	public function testXmdText(){
-		$parent = 0;
-		$res =$this->Xmddoc->xmd_text($parent = 0);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXmdXml(){
-		$increase = '  ';
-		$indent = '';
-		$lbr = "\n";
-		$parent = 0;
-		$res = $this->Xmddoc->xmd_xml($increase, $indent, $lbr, $parent);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXmdValue($xmPath, $parent, $fix, $fun){
-		$xmPath='';
-		$parent = 0;
-		$fix = array();
-		$fun = '';
-		$res = $this->Xmddoc->xmd_value($xmPath, $parent, $fix, $fun);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXmdHtmlValue(){
-		$xmPath='';
-		$parent = 0;
-		$fun = 'htmlspecialchars';
-		$res = $this->Xmddoc->xmd_html_value($xmPath, $parent , $fun );
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	public function testXmdSelectSingleElement(){
-		$xmPath='';
-		$parent = 0;
-		$res = $this->Xmddoc->xmd_select_single_element($xmPath, $parent);
-		$this->assertTrue(is_numeric($res));
-		$this->assertTrue($res);
-		//var_dump($res);
-	}
-
-	public function testXmdSelectElementsWhere(){
-		$xmPath='';
-		$subPath = '.';
-		$value = '';
-		$parent = 0;
-		$res = $this->Xmddoc->xmd_select_elements_where($xmPath, $subPath, $value, $parent);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	public function testXmdSelectElementsWhereNotempty(){
-		$xmPath='';
-		$subPath = '.';
-		$parent = 0;
-		$res = $this->Xmddoc->xmd_select_elements_where_notempty($xmPath,$subPath, $parent);
-        $this->assertTrue(is_array($res));
-        //var_dump($res);
-    }
-
-    public function testxmd_select_elements(){
-    	$xmPath='';
-    	$parent = 0;
-    	$res = $this->Xmddoc->xmd_select_elements($xmPath, $parent);
-    	$this->assertTrue(is_array($res));
-    	//var_dump($res);
-    }
-
-    public function testXmdSelectElements(){
-    	$xmPath='';
-    	$parent = 0;
-    	$res = $this->Xmddoc-> xmd_select_elements($xmPath, $parent);
-    	$this->assertTrue(is_array($res));
-    	//var_dump($res);
-    }
-}
-?>
diff --git a/tests/main/install/install_upgrade.lib.test.php b/tests/main/install/install_upgrade.lib.test.php
deleted file mode 100755
index 5d8036f9b3..0000000000
--- a/tests/main/install/install_upgrade.lib.test.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-class TestInstallUpgrade extends UnitTestCase{
-
-	public function TestInstallUpgrade() {
-
-		$this->UnitTestCase('testing the function used by '.
-						    'the install and upgrade scripts');
-	}
-
-	public function testSetFileFolderPermissions() {
-		$res = set_file_folder_permissions();
-		$this->assertTrue(is_null($res));
-		$this->assertNull($res);
-		//var_dump($res);
-	}
-
-	/*public function testWriteCoursesHtaccessFile() {
-		$chamilo_path_folder = api_get_path(SYS_PATH);
-		$url_append=$chamilo_path_folder.'main/install/';
-		$res = write_courses_htaccess_file($url_append);
-		if(is_bool($res)){
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res === true || $res === false);
-		}else
-		$this->assertEqual($chamilo_path_folder.'main/install/',$res);
-		//var_dump($res);
-	}*/
-
-	public function testSplitSqlFile() {
-		$ret='';
-		$sql='';
-		$res = split_sql_file($ret, $sql);
-		$this->assertTrue($res);
-		$this->assertTrue(is_bool($res));
-		$this->assertTrue($res===true);
-	}
-
-	public function testMyDirectoryToArray() {
-		$chamilo_path_folder= api_get_path(SYS_PATH);
-		$directory= $chamilo_path_folder.'home';
-		$res = my_directory_to_array($directory);
-		$this->assertTrue(is_array($res));
-	}
-
-	/*
-	public function testDeleteCourse() {
-		global $cidReq;
-		$resu = CourseManager::delete_course($cidReq);
-		session_destroy();
-	}*/
-
-
-}
-?>
diff --git a/tests/main/mySpace/myspace.lib.test.php b/tests/main/mySpace/myspace.lib.test.php
deleted file mode 100755
index 8c356ab4c4..0000000000
--- a/tests/main/mySpace/myspace.lib.test.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-
-class TestMySpaceLib extends UnitTestCase {
-
-	public function TestMySpaceLib() {
-		$this->UnitTestCase('Test My Space');
-	}
-
-
-	public function __construct() {
-		// The constructor acts like a global setUp for the class
-		require_once api_get_path(SYS_TEST_PATH).'setup.inc.php';
-	}
-/*
-
-	public function testExportCsv() {
-		//ob_start();
-		$res = MySpace::export_csv($header = array(1, 2 ,3), $data = array(1, 2 ,3), $file_name = 'export.csv');
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-*/
-	public function testGetConnectionsToCourse() {
-		//ob_start();
-		$res = MySpace::get_connections_to_course($user_id = 1, $course_code = 'COURSETEST');
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testCourseInfoTrackingFilter() {
-		//ob_start();
-		$res = MySpace::course_info_tracking_filter($user_id = 1, $url_params = array(), $row = array());
- 		$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testDisplayTrackingUserOverview() {
-		ob_start();
-		$res = MySpace::display_tracking_user_overview();
- 		$this->assertTrue(is_null($res));
-		ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testDisplayUserOverviewExportOptions() {
-		//ob_start();
-		$res = MySpace::display_user_overview_export_options();
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testExercisesResults() {
-		//ob_start();
-		$res = MySpace::exercises_results($user_id = 1, $course_code = 'COURSETEST');
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testExportTrackingUserOverview() {
-		//ob_start();
-		$res = MySpace::export_tracking_user_overview();
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testGetCourseData() {
-		//ob_start();
-		$res = MySpace::get_course_data($from = 1, $number_of_items = 2, $column = 2, $direction = 1);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function testGetNumberOfUsersTrackingOverview() {
-		//ob_start();
-		$res = MySpace::get_number_of_users_tracking_overview();
- 		$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testGetUserDataTrackingOverview() {
-		//ob_start();
-		$res = MySpace::get_user_data_tracking_overview($from = 1, $number_of_items = 1, $column = 1, $direction = 1);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-*/
-	public function testGetUserOverviewExportExtraFields() {
-		//ob_start();
-		$res = MySpace::get_user_overview_export_extra_fields($user_id = 1);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testMakeUsername() {
-		//ob_start();
-		$res = MySpace::make_username($firstname = 'Vargas', $lastname = 'Carlos', $username = 'cvargas', $language = null, $encoding = null);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testCheckUserInArray() {
-		//ob_start();
-		$res = MySpace::check_user_in_array($usernames = array(), $user_array = array());
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testUserAvailableInSession() {
-		//ob_start();
-		$res = MySpace::user_available_in_session($username = 1, $course_list = array(), $id_session = 1);
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testCheckAllUsernames() {
-		//ob_start();
-		$res = MySpace::check_all_usernames($users = array(), $course_list = array(), $id_session = 1);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testGetUserCreator() {
-		//ob_start();
-		$res = MySpace::get_user_creator($users = array());
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testValidate_data() {
-		//ob_start();
-		$res = MySpace::validate_data($users = array(), $id_session = null);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testCompleteMissingData() {
-		//ob_start();
-		$res = MySpace::complete_missing_data($user = 1);
- 		$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}*//*
-
-	public function testSaveData() {
-		//ob_start();
-		$res = MySpace::save_data($users = array(), $course_list = array(), $id_session = 1);
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testParseCsvData() {
-		//ob_start();
-		$res = MySpace::parse_csv_data($file = '');
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function testElementStart() {
-		//ob_start();
-		$res = MySpace::element_start($parser = 'Contact', $data = '');
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testElementEnd() {
-		//ob_start();
-		$res = MySpace::element_end($parser = 'Contact', $data = '');
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testCharacterData() {
-		//ob_start();
-		$res = MySpace::character_data($parser = 'Contact', $data = '');
- 		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testParseXmlData() {
-		//ob_start();
-		$res = MySpace::parse_xml_data($file = '');
- 		$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class
-		//require_once api_get_path(SYS_TEST_PATH).'teardown.inc.php';
-	}
-}
diff --git a/tests/main/newscorm/learnpath.class.test.php b/tests/main/newscorm/learnpath.class.test.php
deleted file mode 100755
index e7f69ae4d5..0000000000
--- a/tests/main/newscorm/learnpath.class.test.php
+++ /dev/null
@@ -1,1400 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpath.class.php';
-
-class TestLearnpath extends UnitTestCase {
-
-    const course = 'COURSETEST';
-
-    public function testAddItem() {
-        //ob_start();
-        $parent = 2;
-        $previous = 1;
-        $type = 'dir';
-        $id = 1;
-        $title = 'Title';
-        $description = 'Description';
-        $prerequisites = 0;
-        $max_time_allowed = 0;
-
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->add_item($parent, $previous, $type, $id, $title, $description, $prerequisites, $max_time_allowed);
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testAddLp() {
-        //ob_start();
-        $name = '';
-        $description = '';
-        $learnpath = 'guess';
-        $origin = 'zip';
-        $zipname = '';
-        $res = learnpath::add_lp(self::course, $name, $description, $learnpath, $origin, $zipname);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    /*
-    public function testAutocompleteParents() {
-        //ob_start();
-        $item = 1;
-
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-        $res = $obj->autocomplete_parents($item);
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        var_dump($res);
-    }
-    */
-    public function testAutosave() {
-        //ob_start();
-        $res = learnpath::autosave();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testBuildActionMenu() {
-        ob_start();
-        $res = learnpath::build_action_menu();
-        $this->assertTrue(is_null($res));
-        ob_end_clean();
-        //var_dump($res);
-    }
-
-
-    public function testClose() {
-        //ob_start();
-        $res = learnpath::close();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testCreateDocument() {
-        //ob_start();
-        $_course = '';
-        $res = learnpath::create_document($_course);
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testCreateJs() {
-        //ob_start();
-        $res = learnpath::create_js();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testCreatePath() {
-        //ob_start();
-        $path = '';
-        $res = learnpath::create_path($path);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testCreateTreeArray() {
-        //ob_start();
-        $array = '';
-        $parent = 0;
-        $depth = -1;
-        $tmp = array ();
-        $res = learnpath::create_tree_array($array, $parent, $depth, $tmp);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDisplayDocument() {
-        //ob_start();
-        $id = 1;
-        $show_title = false;
-        $iframe = true;
-        $edit_link = false;
-        $res = learnpath::display_document($id, $show_title, $iframe, $edit_link);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testDisplayDocumentForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = 'new';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_document_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testDisplayEditItem() {
-        //ob_start();
-        $item_id = '';
-        $res = learnpath::display_edit_item($item_id);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testDisplayForumForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_forum_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDisplayHotpotatoesForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_hotpotatoes_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testDisplayItem() {
-        //ob_start();
-        $item_id = '';
-        $iframe = true;
-        $msg = '';
-        $res = learnpath::display_item($item_id, $iframe, $msg);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-/*	public function testDisplayItemForm() {
-        //ob_start();
-        $item_type = '';
-        $title = '';
-        $action = 'add';
-        $id = 0;
-        $extra_info = 'new';
-        $course='COURSETEST';
-        $lp_id = 1;
-        $user_id = 1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-        $res = $obj->display_item_form($item_type, $title, $action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDisplayItemPrerequisitesForm() {
-        //ob_start();
-        $item_id = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_item_prerequisites_form($item_id);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testDisplayItemSmallForm() {
-        //ob_start();
-        $item_type = '';
-        $title = '';
-        $data = '';
-        $res = learnpath::display_item_small_form($item_type, $title, $data);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testDisplayLinkForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_link_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDisplayManipulate() {
-        //ob_start();
-        $item_id = '';
-        $item_type = TOOL_DOCUMENT;
-        $res = learnpath::display_manipulate($item_id, $item_type);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testDisplayMoveItem() {
-        //ob_start();
-        $item_id = '';
-        $res = learnpath::display_move_item($item_id);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testDisplayQuizForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_quiz_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-/*	public function testDisplayResources() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_resources();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDisplayStudentPublicationForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_student_publication_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDisplayThreadForm() {
-        //ob_start();
-        $action = 'add';
-        $id = 0;
-        $extra_info = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->display_thread_form($action, $id, $extra_info);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testEditDocument() {
-        //ob_start();
-        $_course='';
-        $res = learnpath::edit_document($_course);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testEditItem() {
-        //ob_start();
-        $id = '';
-        $parent = '';
-        $previous = '';
-        $title = '';
-        $description = '';
-        $prerequisites = 0;
-        $audio = NULL;
-        $max_time_allowed = 0;
-        $res = learnpath::edit_item($id, $parent, $previous, $title, $description, $prerequisites, $audio, $max_time_allowed);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testEditItemPrereq() {
-        //ob_start();
-        $id = '';
-        $prerequisite_id = '';
-        $mastery_score = 0;
-        $max_score = 100;
-        $res = learnpath::edit_item_prereq($id, $prerequisite_id, $mastery_score, $max_score);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testExportLp() {
-        //ob_start();
-        $type = 'scorm';
-        $id = 1;
-        $zipname = 'FILE';
-        $res = learnpath::export_lp($type, self::course, $id, $zipname);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testFirst() {
-        //ob_start();
-        $res = learnpath::first();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetAuthor() {
-        //ob_start();
-        $res = learnpath::get_author();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetBrotherChapters() {
-        //ob_start();
-        $id = '';
-        $res = learnpath::getSiblingDirectories($id);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetBrotherItems() {
-        //ob_start();
-        $id = '';
-        $res = learnpath::get_brother_items($id);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testGetCommonIndexTermsByPrefix() {
-        //ob_start();
-        $prefix = '';
-        $res = learnpath::get_common_index_terms_by_prefix($prefix);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetCompleteItemsCount() {
-        //ob_start();
-        $res = learnpath::get_complete_items_count();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testGetCurrentItemId() {
-        //ob_start();
-        $res = learnpath::get_current_item_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetDocuments() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_documents();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetExercises() {
-        //ob_start();
-        $res = learnpath::get_exercises();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetExtension() {
-        //ob_start();
-        $filename = 'file';
-        $res = learnpath::get_extension($filename);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetFirstItemId() {
-        //ob_start();
-        $res = learnpath::get_first_item_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetFlatOrderedItemsList() {
-        //ob_start();
-        $lp = 1;
-        $parent = 0;
-        $res = learnpath::get_flat_ordered_items_list($lp, $parent);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-        /*
-    public function testGetForums() {
-        //ob_start();
-
-        //require_once api_get_path(WEB_PATH).('forum/forumpublic function.inc.php');
-        //require_once api_get_path(WEB_PATH).('forum/forumconfig.inc.php');
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->get_forums();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetHtmlToc() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->get_html_toc();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testGetId() {
-        //ob_start();
-        $res = learnpath::get_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetInteractionsCountFromDb() {
-        //ob_start();
-        $lp_iv_id = 0;
-        $res = learnpath::get_interactions_count_from_db($lp_iv_id);
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testGetItemsDetailsAsJs() {
-        //ob_start();
-        $varname='olms.lms_item_types';
-        $res = learnpath::get_items_details_as_js($varname);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetItemsStatusList() {
-        //ob_start();
-        $res = learnpath::get_items_status_list();
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetIvInteractionsArray() {
-        //ob_start();
-        $lp_iv_id = '';
-        $res = learnpath::get_iv_interactions_array($lp_iv_id);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testGetIvObjectivesArray() {
-        //ob_start();
-        $lp_iv_id = 0;
-        $res = learnpath::get_iv_objectives_array($lp_iv_id);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testGetJsInfo() {
-        //ob_start();
-        $item_id = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->get_js_info($item_id);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }	*/
-
-    public function testGetJsLib() {
-        //ob_start();
-        $res = learnpath::get_js_lib();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetLast() {
-        //ob_start();
-        $res = learnpath::get_last();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetLink() {
-        //ob_start();
-        $type = 'http';
-        $item_id = null;
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_link($type, $item_id);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetLinks() {
-        //ob_start();
-        $res = learnpath::get_links();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetLpSessionId() {
-        //ob_start();
-        $res = learnpath::get_lp_session_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetMaker() {
-        //ob_start();
-        $res = learnpath::get_maker();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetMediaplayer() {
-        //ob_start();
-        $autostart='true';
-        $res = learnpath::get_mediaplayer($autostart);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetName() {
-        //ob_start();
-        $res = learnpath::get_name();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetNavigationBar() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_navigation_bar();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetNextIndex() {
-        //ob_start();
-        $res = learnpath::get_next_index();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetNextItemId() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_next_item_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetObjectivesCountFromDb() {
-        //ob_start();
-        $lp_iv_id = 0;
-        $res = learnpath::get_objectives_count_from_db($lp_iv_id);
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testGetPackageType() {
-        //ob_start();
-        $file_path = '';
-        $file_name = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->get_package_type($file_path, $file_name);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }*/
-
-    public function testGetPreviewImage() {
-        //ob_start();
-        $res = learnpath::get_preview_image();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetPreviousIndex() {
-        //ob_start();
-        $res = learnpath::get_previous_index();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetPreviousItemId() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_previous_item_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetProgress() {
-        //ob_start();
-        $res = learnpath::get_progress();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetProgressBar() {
-        //ob_start();
-        $mode = '';
-        $percentage = -1;
-        $text_add = '';
-        $from_lp = false;
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_progress_bar($mode, $percentage, $text_add, $from_lp);
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetProgressBarMode() {
-        //ob_start();
-        $res = learnpath::get_progress_bar_mode();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetProgressBarText() {
-        //ob_start();
-        $mode = '';
-        $add = 0;
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_progress_bar_text($mode, $add);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetProximity() {
-        //ob_start();
-        $res = learnpath::get_proximity();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetScormPrereqString() {
-        //ob_start();
-        $item_id = 1;
-        $res = learnpath::get_scorm_prereq_string($item_id);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetScormXmlNode() {
-        //ob_start();
-        $children = 'children';
-        $id = 1;
-        $res = learnpath::get_scorm_xml_node($children, $id);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetStudentPublications() {
-        //ob_start();
-        $res = learnpath::get_student_publications();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetTheme() {
-        //ob_start();
-        $res = learnpath::get_theme();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testGetToc() {
-        //ob_start();
-        $res = learnpath::get_toc();
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testGetTotalItemsCount() {
-        //ob_start();
-        $res = learnpath::get_total_items_count();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testGetTotalItemsCountWithoutChapters() {
-        //ob_start();
-        $res = learnpath::getTotalItemsCountWithoutDirs();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    */
-    public function testGetType() {
-        //ob_start();
-        $get_name = false;
-        $res=learnpath::get_type($get_name) ;
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetTypeStatic() {
-        //ob_start();
-        $lp_id = 0;
-        $res = learnpath::get_type_static($lp_id);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetUpdateQueue() {
-        //ob_start();
-        $res = learnpath::get_update_queue();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testGetUserId() {
-        //ob_start();
-        $res = learnpath::get_user_id();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testGetView() {
-        //ob_start();
-        $attempt_num = 0;
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->get_view($attempt_num);
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    */
-    public function testGetViewId() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->get_view_id();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testHasAudio() {
-        //ob_start();
-        $res = learnpath::has_audio();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }*/
-
-    public function testLearnpath() {
-        //ob_start();
-        $course = '';
-        $lp_id = '';
-        $user_id = '';
-        $res = learnpath::__construct($course, $lp_id, $user_id);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testLog() {
-        //ob_start();
-        $msg = '';
-        $res = learnpath::log($msg);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testMoveDown() {
-        //ob_start();
-        $lp_id = 0;
-        $res = learnpath::move_down($lp_id);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testMoveItem() {
-        //ob_start();
-        $id = 1;
-        $direction = '';
-        $res = learnpath::move_item($id, $direction);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testMoveUp() {
-        //ob_start();
-        $lp_id = 0;
-        $res = learnpath::move_up($lp_id);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testNext() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->next();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }	*/
-
-    public function testOpen() {
-        //ob_start();
-        $id = '';
-        $res = learnpath::open($id);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testOverview() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->overview();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    */
-    public function testPrerequisitesMatch() {
-        //ob_start();
-        $item = null;
-        $res = learnpath::prerequisites_match($item);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testPrevious() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->previous();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    /*public function testRestart() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->restart();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }*/
-
-    public function testSaveCurrent() {
-        //ob_start();
-        $res = learnpath::save_current();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSaveItem() {
-        //ob_start();
-        $item_id = null;
-        $from_outside = true;
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->save_item($item_id, $from_outside);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSaveLast() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->save_last();
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testScormExport() {
-        //ob_start();
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->scorm_export();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testSetAuthor() {
-        //ob_start();
-        $name = '';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->set_author($name);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetCurrentItem() {
-        //ob_start();
-        $item_id = null;
-        $res = learnpath::set_current_item($item_id);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetEncoding() {
-        //ob_start();
-        $enc = 'ISO-8859-15';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->set_encoding($enc);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetErrorMsg() {
-        //ob_start();
-        $error = '';
-        $res = learnpath::set_error_msg($error);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetJslib() {
-        //ob_start();
-        $lib = '';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->set_jslib($lib);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetMaker() {
-        //ob_start();
-        $name = '';
-        $res = learnpath::set_maker($name);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetName() {
-        //ob_start();
-        $name = '';
-        $res = learnpath::set_name($name);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetPreviewImage() {
-        //ob_start();
-        $name = '';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->set_preview_image($name);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetPreviousItem() {
-        //ob_start();
-        $id = '';
-        $res = learnpath::set_previous_item($id);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetProximity() {
-        //ob_start();
-        $name = '';
-        $res = learnpath::set_proximity($name);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetTermsByPrefix() {
-        //ob_start();
-        $terms_string = '';
-        $prefix = '';
-        $res = learnpath::set_terms_by_prefix($terms_string, $prefix);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testSetTheme() {
-        //ob_start();
-        $name = '';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->set_theme($name);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    /*
-    public function testSortTreeArray() {
-        //ob_start();
-        $array = '';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->sort_tree_array($array);
-        $this->assertTrue(is_array($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    */
-    public function testStartCurrentItem() {
-        //ob_start();
-        $allow_new_attempt = false;
-        $res = learnpath::start_current_item($allow_new_attempt);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testStopPreviousItem() {
-        //ob_start();
-        $res = learnpath::stop_previous_item();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testTogglePublish() {
-        //ob_start();
-        $lp_id = '';
-        $set_visibility = 'v';
-        $res = learnpath::toggle_publish($lp_id, $set_visibility);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    */
-    public function testToggleVisibility() {
-        //ob_start();
-        $lp_id = '';
-        $set_visibility = 1;
-        $res = learnpath::toggle_visibility($lp_id, $set_visibility);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testTreeArray() {
-        //ob_start();
-        $array = '';
-        $res = learnpath::tree_array($array);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-*/
-    public function testUpdateDefaultScormCommit() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->update_default_scorm_commit();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testUpdateDefaultViewMode() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->update_default_view_mode();
-        $this->assertTrue(is_string($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testUpdateDisplayOrder() {
-        //ob_start();
-        $res = learnpath::update_display_order();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testUpdateReinit() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->update_reinit();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testUpdateScormDebug() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->update_scorm_debug();
-        $this->assertTrue(is_numeric($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testUploadImage() {
-        //ob_start();
-        $image_array = '';
-        $res = learnpath::upload_image($image_array);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-/*
-    public function testWriteResourcesTree() {
-        //ob_start();
-        $resources_sorted = '';
-        $num = 0;
-        $res = learnpath::write_resources_tree($resources_sorted, $num);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-    public function testDelete() {
-        //ob_start();
-        $course = null;
-        $id = null;
-        $delete = 'keep';
-        $course='COURSETEST';
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath($course, $lp_id, $user_id);
-
-        $res = $obj->delete($course, $id, $delete);
-        $this->assertTrue(is_null($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }*/
-
-    public function testDeleteChildrenItems() {
-        //ob_start();
-        $id = '';
-        $res = learnpath::delete_children_items($id);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDeleteItem() {
-        //ob_start();
-        $id = '';
-        $remove = 'keep';
-        $res = learnpath::delete_item($id, $remove);
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-    public function testDeleteLpImage() {
-        //ob_start();
-        $lp_id=1;
-        $user_id=1;
-        $obj = new learnpath(self::course, $lp_id, $user_id);
-
-        $res = $obj->delete_lp_image();
-        $this->assertTrue(is_bool($res));
-        //ob_end_clean();
-        //var_dump($res);
-    }
-
-
-}
-?>
diff --git a/tests/main/newscorm/learnpathItem.class.test.php b/tests/main/newscorm/learnpathItem.class.test.php
deleted file mode 100755
index 1558a02636..0000000000
--- a/tests/main/newscorm/learnpathItem.class.test.php
+++ /dev/null
@@ -1,593 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpathItem.class.php';
-require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpath.class.php';
-
-
-class TestLearnpathItem extends UnitTestCase {
-	
-	
-	public function TestScorm() {
-		$this->UnitTestCase('Test Scorm');
-	}
-	
-
-	public function __construct() {
-		// The constructor acts like a global setUp for the class			
-		require_once api_get_path(SYS_TEST_PATH).'setup.inc.php';
-	}
-	
-	
-	public function testAddLp() {
-		//ob_start();
-		$course = 'COURSETEST';
-		$name = 'Leccion';
-		$description = 'Leccion';
-		$learnpath = 'guess';
-		$origin = 'zip';
-		$zipname = '';
-		$res = learnpath::add_lp($course, $name, $description, $learnpath, $origin, $zipname);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	
-	public function testAddChild() {
-		//ob_start();
-		$res = learnpathItem::add_child($item = 1);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testAddInteraction() {
-		//ob_start();
-		$res = learnpathItem::add_interaction($index = 1,$params = array());
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-
-	public function testAddObjective() {
-		//ob_start();
-		$res = learnpathItem::add_objective($index = 1,$params = array());
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testClose() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->close();
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testDelete() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->delete();
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function testDropChild() {
-		//ob_start();
-		$res = learnpathItem::drop_child($item = 1);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetAttemptId() {
-		//ob_start();
-		$res = learnpathItem::get_attempt_id();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetChildren() {
-		//ob_start();
-		$res = learnpathItem::get_children();
-	 	$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetCoreExit() {
-		//ob_start();
-		$res = learnpathItem::get_core_exit();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetCurrentStartTime() {
-		//ob_start();
-		$res = learnpathItem::get_current_start_time();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetDescription() {
-		//ob_start();
-		$res = learnpathItem::get_description();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetFilePath() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->get_file_path($path_to_scorm_dir='');
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetId() {
-		//ob_start();
-		$res = learnpathItem::get_id();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testLoadInteractions() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->load_interactions();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function testGetInteractionsCount() {
-		//ob_start();
-		$res = learnpathItem::get_interactions_count($checkdb=false);
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetInteractionsJsArray() {
-		//ob_start();
-		$res = learnpathItem::get_interactions_js_array($checkdb=false);
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetObjectivesCount() {
-		//ob_start();
-		$res = learnpathItem::get_objectives_count();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetLaunchData() {
-		//ob_start();
-		$res = learnpathItem::get_launch_data();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetLessonLocation() {
-		//ob_start();
-		$res = learnpathItem::get_lesson_location();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetLessonMode() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->get_lesson_mode();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetLevel() {
-		//ob_start();
-		$res = learnpathItem::get_level();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetMasteryScore() {
-		//ob_start();
-		$res = learnpathItem::get_mastery_score();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetMax() {
-		//ob_start();
-		$res = learnpathItem::get_max();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetMaxTimeAllowed() {
-		//ob_start();
-		$res = learnpathItem::get_max_time_allowed();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetMin() {
-		//ob_start();
-		$res = learnpathItem::get_min();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetParent() {
-		//ob_start();
-		$res = learnpathItem::get_parent();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetPath() {
-		//ob_start();
-		$res = learnpathItem::get_path();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetPrereqString() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->get_prereq_string;
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	///var_dump($res);
-	}
-	
-	public function testGetPreventReinit() {
-		//ob_start();
-		$res = learnpathItem::get_prevent_reinit();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetRef() {
-		//ob_start();
-		$res = learnpathItem::get_ref();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetResourcesFromSource() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->get_resources_from_source($type=null,$abs_path=null, $recursivity=1);
-	 	$this->assertTrue(is_array($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetScore() {
-		//ob_start();
-		$res = learnpathItem::get_score();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetStatus() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->get_status($check_db=true,$update_local=false);
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetSuspendData() {
-		//ob_start();
-		$res = learnpathItem::get_suspend_data();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetScormTime() {
-		//ob_start();
-		$res = learnpathItem::get_scorm_time($origin='php',$given_time=null);
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetTerms() {
-		//ob_start();
-		$res = learnpathItem::get_terms();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetTitle() {
-		//ob_start();
-		$res = learnpathItem::get_title();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetTotalTime() {
-		//ob_start();
-		$res = learnpathItem::get_total_time();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetType() {
-		//ob_start();
-		$res = learnpathItem::get_type();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetViewCount() {
-		//ob_start();
-		$res = learnpathItem::get_view_count();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testIsDone() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->is_done();
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testIsRestartAllowed() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->is_restart_allowed();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testOpen() {
-		//ob_start();
-		$res = learnpathItem::open($allow_new_attempt=false);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testOutput() {
-		//ob_start();
-		$res = learnpathItem::output();
-	 	$this->assertTrue(is_string($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testParsePrereq() {
-		//ob_start();
-		$res = learnpathItem::parse_prereq($prereqs_string = '', $items = array(), $refs_list = array(),$user_id = 1);
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testRestart() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->restart();
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSave() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->save($from_outside=true,$prereqs_complete=false);
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function testSetAttemptId() {
-		//ob_start();
-		$res = learnpathItem::set_attempt_id($num = 1);
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetCoreExit() {
-		//ob_start();
-		$res = learnpathItem::set_core_exit($value = 1);
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetDescription() {
-		//ob_start();
-		$res = learnpathItem::set_description($string = '');
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetLessonLocation() {
-		//ob_start();
-		$res = learnpathItem::set_lesson_location($location = '');
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetLevel() {
-		//ob_start();
-		$res = learnpathItem::set_level($int=0);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetLpView() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->set_lp_view($lp_view_id = 1);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetPath() {
-		//ob_start();
-		$res = learnpathItem::set_path($string='');
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetPreventReinit() {
-		//ob_start();
-		$res = learnpathItem::set_prevent_reinit($prevent = 1);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetScore() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1);
-		$res = $obj->set_score($score = 1.56);
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetMaxScore() {
-		//ob_start();
-		$res = learnpathItem::set_max_score($score = 1.56);
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testSetStatus() {
-		//ob_start();
-		$res = learnpathItem::set_status($status = '');
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function testSetTerms() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->set_terms($terms = '');
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testGetSearchDid() {
-		//ob_start();
-		$res = learnpathItem::get_search_did();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetTime() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->set_time($scorm_time = '',$format='scorm');
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetTitle() {
-		//ob_start();
-		$res = learnpathItem::set_title($string='');
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetType() {
-		//ob_start();
-		$res = learnpathItem::set_type($string='');
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testStatusIs() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->status_is($list=array());
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testUpdateTime() {
-		//ob_start();
-		$res = learnpathItem::update_time($total_sec=0);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testWriteObjectivesToDb() {
-		//ob_start();
-		$res = learnpathItem::write_objectives_to_db();
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	/*
-	public function testWriteToDb() {
-		//ob_start();
-		$obj = new learnpathItem($db_id = 1, $user_id = 1); 
-		$res = $obj->write_to_db();
-	 	$this->assertTrue(is_bool($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	*/
-	public function __destruct() {
-		// The destructor acts like a global tearDown for the class			
-	//	require_once api_get_path(SYS_TEST_PATH).'teardown.inc.php';			
-	}
-}
\ No newline at end of file
diff --git a/tests/main/newscorm/openoffice_document.class.test.php b/tests/main/newscorm/openoffice_document.class.test.php
deleted file mode 100755
index 138c63ed61..0000000000
--- a/tests/main/newscorm/openoffice_document.class.test.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * Created on 18/02/2010
- *
- * To change the template for this generated file go to
- * Window - Preferences - PHPeclipse - PHP - Code Templates
- */
-?>
diff --git a/tests/main/newscorm/openoffice_presentation.class.test.php b/tests/main/newscorm/openoffice_presentation.class.test.php
deleted file mode 100755
index b7f4d1dfa5..0000000000
--- a/tests/main/newscorm/openoffice_presentation.class.test.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-//require_once(api_get_path(SYS_CODE_PATH).'lp/openoffice_presentation.class.php');
-
-class TestOpenofficePresentation extends UnitTestCase {
-	/*
-	public function testAddItem() {
-		//ob_start();
-		$res = OpenofficePresentation::make_lp($files=array());
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testAddCommandParameters() {
-		//ob_start();
-		$res = OpenofficePresentation::add_command_parameters();
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}
-	
-	public function testSetSlideSize() {
-		//ob_start();
-		$res = OpenofficePresentation::set_slide_size($width = '400',$height = '500');
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}	
-	
-	public function testAddDocsToVisio() {
-		//ob_start();
-		$res = OpenofficePresentation::add_docs_to_visio($files=array());
-	 	$this->assertTrue(is_numeric($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}*/
-}
-?>
diff --git a/tests/main/newscorm/openoffice_text.class.test.php b/tests/main/newscorm/openoffice_text.class.test.php
deleted file mode 100755
index 9698136b9e..0000000000
--- a/tests/main/newscorm/openoffice_text.class.test.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpath.class.php';
-require_once api_get_path(SYS_CODE_PATH) . 'lp/openoffice_text.class.php';
-require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
-
-class TestOpenOfficeTextClass extends UnitTestCase {
-
-	public function testOpenOfficeText() {
-		//ob_start();
-		$res = OpenofficeText::make_lp($files=array());
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}	
-/*
-	public function testDealPerChapter() {
-		//ob_start();
-		$obj = new OpenofficeText($split_steps=false, $course_code=null, $resource_id=null,$user_id=null); 
-		$res = $obj->dealPerChapter($header = 'Header', $content = 'Content');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testDalPerPage() {
-		//ob_start();
-		$obj = new OpenofficeText($split_steps=false, $course_code=null, $resource_id=null,$user_id=null); 
-		$res = $obj->dealPerPage($header = 'Header', $body= 'Body');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-*/
-	public function testAddCommandParameters() {
-		//ob_start();
-		$res = OpenofficeText::add_command_parameters();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testFormatPageContent() {
-		//ob_start();
-		$res = OpenofficeText::format_page_content($header = 'Header', $content = 'Content');
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}	
-}
-?> 
\ No newline at end of file
diff --git a/tests/main/newscorm/openoffice_text_document.class.test.php b/tests/main/newscorm/openoffice_text_document.class.test.php
deleted file mode 100755
index a63857c85d..0000000000
--- a/tests/main/newscorm/openoffice_text_document.class.test.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-//require_once(api_get_path(SYS_CODE_PATH).'lp/openoffice_text_document.class.php');
-
-class TestOpenOfficeTextDocument extends UnitTestCase {
-/*
-	public function testMakeLp() {
-		//ob_start();
-		$obj = new OpenofficeTextDocument($split_steps=false, $course_code=null, $resource_id=null,$user_id=null); 		
-		$res = $obj->make_lp($files=array());
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testDealPerChapter() {
-		//ob_start();
-		$res = OpenOfficeTextDocument::dealPerChapter($header = 'Header', $content = 'Content');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testDealPerPage() {
-		//ob_start();
-		$res = OpenOfficeTextDocument::dealPerPage($header = 'Header',$body = 'Content');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testAddCommandParameters() {
-		//ob_start();
-		$res = OpenOfficeTextDocument::add_command_parameters();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testFormatPageContent() {
-		//ob_start();
-		$res = OpenOfficeTextDocument::format_page_content($header = 'Header', $content = 'Content');
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}	*/
-}
-?>
\ No newline at end of file
diff --git a/tests/main/newscorm/scorm.class.test.php b/tests/main/newscorm/scorm.class.test.php
deleted file mode 100755
index 36014b81a3..0000000000
--- a/tests/main/newscorm/scorm.class.test.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpath.class.php';
-require_once api_get_path(SYS_CODE_PATH) . 'lp/scorm.class.php';
-
-class TestScormClass extends UnitTestCase {
-/*
-	public function testScorm() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->scorm($course_code=null,$resource_id=null,$user_id=null);
-	 	$this->assertTrue(is_null($res));
-		//ob_end_clean();
-	 	//var_dump($res);
-	}*/
-
-	public function testOpen() {
-		//ob_start();
-		$id = 1;
-		$res = scorm::open($id);
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}		
-	
-	public function testParseManifest() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->parse_manifest($file='');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}	
-	
-	public function testImportManifest() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->import_manifest($course_code = 'COURSETEST');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	/*
-	public function testImportLocalPackage() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->import_local_package($file_path,$current_dir='');
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testImportPackage() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->import_package($zip_file_info,$current_dir = '');
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}*/
-	
-	public function testSetProximity() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->set_proximity($proxy='');
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testSetTheme() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->set_theme($theme='Chamilo');
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testSetPreviewImage() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->set_preview_image($preview_image='');
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testSetAuthor() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->set_author($author='');
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testSetMaker() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->set_maker($maker='');
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testExportZip() {
-		//ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->export_zip($lp_id=null);
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testGetResPath() {
-		//ob_start();
-		$res = scorm::get_res_path($id=1);
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testGetResType() {
-		//ob_start();
-		$res = scorm::get_res_type($id = 1);
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testGetTitle() {
-		//ob_start();
-		$res = scorm::get_title();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testReimportManifest() {
-		ob_start();
-		$course_code = 'COURSETEST';
-		$resource_id = 1;
-		$user_id = 1;
-		$obj = new scorm($course_code, $resource_id, $user_id); 
-		$res = $obj->reimport_manifest($course  = 'COURSETEST',$lp_id=null,$imsmanifest_path='');
-		$this->assertTrue(is_bool($res)); 
-		ob_end_clean();
-		//var_dump($res);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/main/newscorm/scormItem.class.test.php b/tests/main/newscorm/scormItem.class.test.php
deleted file mode 100755
index af47febceb..0000000000
--- a/tests/main/newscorm/scormItem.class.test.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-require_once api_get_path(SYS_CODE_PATH) . 'lp/scormItem.class.php';
-require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpathItem.class.php';
-
-class TestScormItem extends UnitTestCase {
-
-	public function testGetFlatList() {
-		//ob_start();
-		$obj = new scormItem($type='manifest',&$element); 
-		$res = $obj->get_flat_list(&$list,&$abs_order,$rel_order=1,$level=0);
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-/*
-	public function testSave() {
-		//ob_start();
-		$obj = new scormItem($type='manifest',&$element); 
-		$res = $obj->save($from_outside=true,$prereqs_complete=false);
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}*/
-}
-?>
\ No newline at end of file
diff --git a/tests/main/newscorm/scormOrganization.class.test.php b/tests/main/newscorm/scormOrganization.class.test.php
deleted file mode 100755
index 5e2e6a2606..0000000000
--- a/tests/main/newscorm/scormOrganization.class.test.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH) . 'lp/scormOrganization.class.php';
-
-class TestScormOrganization extends UnitTestCase {
-
-	public function testget_flat_items_list() {
-		//ob_start();
-		$obj = new scormOrganization($type='manifest', $element, $scorm_charset='UTF-8'); 
-		$res = $obj->get_flat_items_list();
-		$this->assertTrue(is_array($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testGetScormType() {
-		//ob_start();
-		$res = scormOrganization::get_name();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testGetRef() {
-		//ob_start();
-		$res = scormOrganization::get_ref();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-
-	public function testSetName() {
-		//ob_start();
-		$res = scormOrganization::set_name($title = 'Titulo');
-		$this->assertTrue(is_null($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/main/newscorm/scormResource.class.test.php b/tests/main/newscorm/scormResource.class.test.php
deleted file mode 100755
index 3b11488360..0000000000
--- a/tests/main/newscorm/scormResource.class.test.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH) . 'lp/scormResource.class.php';
-
-class TestScormResource extends UnitTestCase {
-	/*
-	function testScormResource() {
-		//ob_start();
-		$res = scormResource::scormResource($type='manifest',&$element);
-		$this->assertTrue(is_bool($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}	
-	*/
-	public function testGetPath() {
-		//ob_start();
-		$res = scormResource::get_path();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	
-	public function testGetScormType() {
-		//ob_start();
-		$res = scormResource::get_scorm_type();
-		$this->assertTrue(is_string($res)); 
-		//ob_end_clean();
-		//var_dump($res);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/main/permissions/permissions_functions.inc.test.php b/tests/main/permissions/permissions_functions.inc.test.php
deleted file mode 100755
index cde0c28d9c..0000000000
--- a/tests/main/permissions/permissions_functions.inc.test.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH).'permissions/permissions_functions.inc.php';
-//require_once dirname(__FILE__).'/../main/permissions/permissions_functions.inc.php';
-
-class TestPermissions extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Permissions library - main/permissions/permissions_functions.inc.test.php');
-    }
-    /**
-	* This function is called when we assign a role to a user or a group
-	* @param string
-	* @param string
-	* @param int
-	* @param int
-	* @return string
-	*/
-	function testAssignRole(){
-		$content='';
-		$action='';
-		$id=1;
-		$role_id=1;
-		$scope='course';
-		$res = assign_role($content, $action, $id, $role_id, $scope);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	This function displays a checked or unchecked checkbox. The checkbox will be checked if the
-	* user, group or role has the permission for the given tool, unchecked if the user, group or role
-	* does not have the right
-	* @param array
-	* @param string
-	* @param string
-	* @param array
-	* @return null
-	*/
-	function testDisplayCheckboxMatrix(){
-		ob_start();
-		$permission_array=array();
-		$tool='';
-		$permission=1;
-		$inherited_permissions=array();
-		$res = display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-	/**
-	* This function displays a checked or unchecked image. The image will be checked if the
-	* user, group or role has the permission for the given tool, unchecked if the user, group or role
-	* does not have the right
-	* @param $permission_array the array that contains all the permissions of the user, group, role
-	* @param $tool the tool we want to check a permission for
-	* @param $permission the permission we want to check for
-	*/
-	function testDisplayImageMatrix(){
-		//ob_start();
-		$permission_array=array();
-		$tool=1;
-		$permission=1;
-		$inherited_permissions=array($tool => array());
-		$course_admin=false;
-		$editable=true;
-		$res = display_image_matrix($permission_array, $tool, $permission,$inherited_permissions, $course_admin, $editable);
-		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-	/**
-	* Slightly modified:  Toon Keppens
-	* This function displays a checked or unchecked image. The image will be checked if the
-	* user, group or role has the permission for the given tool, unchecked if the user, group or role
-	* does not have the right
-	* @param int
-	* @param string
-	* @param string
-	* @param array
-	* @param bool
-	*/
-	function testDisplayImageMatrixForBlogs(){
-		$permission_array=array();
-		$user_id=1;
-		$tool=1;
-		$permission=1;
-		$inherited_permissions=array();
-		$course_admin=false;
-		$editable=true;
-		$res = display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions, $course_admin, $editable);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	/**
-	* This function displays a list off all the roles of the course (and those defined by the platform admin)
-	* @param
-	* @param
-	*/
-	function testDisplayRoleList(){
-		$current_course_roles='';
-		$current_platform_roles='';
-		$res = display_role_list($current_course_roles, $current_platform_roles);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-	/**
-	* This function gets all the current roles of the user or group
-	* @param string
-	* @return array that contains the name of the roles the user has
-	*/
-	function testGetAllRoles(){
-		$content='course';
-		$res = get_all_roles($content);
-		if (!is_null($res)){
-			$this->assertTrue(is_array($res));
-		}
-		//var_dump($res);
-	}
-	/**
-	* This function retrieves the existing permissions of a user, group or role.
-	* @param $content are we retrieving the rights of a user, a group or a role (the database depends on it)
-	* @param $id the id of the user, group or role
-	*/
-	function testGetPermissions(){
-		$content='user';
-		$id=1;
-		$res = get_permissions($content, $id);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-	/**
-	* This function gets all the current roles of the user or group
-	* @param $content are we finding the roles for a user or a group (the database depends on it)
-	* @param $id the id of the user or group
-	* @return array that contains the name of the roles the user has
-	*/
-	function testGetRoles(){
-		$content='user';
-		$id=1;
-		$scope='course';
-		$res = get_roles($content, $id, $scope);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-	/**
-	* This function gets all the roles that are defined
-	* @param $content are we finding the roles for a user or a group (the database depends on it)
-	* @param $id the id of the user or group
-	* @param string	Deprecated parameter allowing use of 'platform' scope - the corresponding tables don't exist anymore so the scope is always set to 'course'
-	* @return array that contains the name of the roles the user has
-	*/
-	function testGetRolesPermissions(){
-		$content='user';
-		$id=1;
-		$scope='course';
-		$res = get_roles_permissions($content, $id, $scope);
-		if (!is_null($res)){
-			$this->assertTrue(is_array($res));
-		}
-		//var_dump($res);
-	}
-	/**
-	* the array that contains the current permission a user, group or role has will now be changed depending on
-	* the Dokeos Config Setting for the permissions (limited [add, edit, delete] or full [view, add, edit, delete, move, visibility]
-	* @param $content are we retrieving the rights of a user, a group or a role (the database depends on it)
-	* @param $id the id of the user, group or role
-	* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
-	* @version 1.0
-	* @todo currently there is a setting user_permissions and group_permissions. We should merge this in one config setting.
-	*/
-	function testLimitedOrFull(){
-		$current_permissions=array();
-		$res = limited_or_full($current_permissions);
-		if (!is_null($res)){
-			$this->assertTrue(is_array($res));
-		}
-		//var_dump($res);
-	}
-
-	function testMyPrintR(){
-		ob_start();
-		$array='';
-		$res = my_print_r($array);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	/**
-	* This function merges permission arrays. Each permission array has the following structure
-	* a permission array has a tool contanst as a key and an array as a value. This value array consists of all the permissions that are granted in that tool.
-	*/
-	function testPermissionArrayMerge(){
-		$array1=array();
-		$array2=array();
-		$res = permission_array_merge($array1, $array2);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-	/**
-	* This function stores one permission in the correct table.
-	* @param $content are we storing rights for a user, a group or a role (the database depends on it)
-	* @param $action are we granting or revoking a permission?
-	* @param $id the id of the user, group or role
-	* @param $tool the tool
-	* @param $permission the permission the user, group or role has been granted or revoked
-	*/
-	function testStoreOnePermission(){
-		$res = store_one_permission('user', 'grant', 2, 'link','');
-		if(!$res === NULL){
-		$this->assertTrue(is_string($res));
-		} else {
-			$this->assertNull($res);
-		}
-		//var_dump($res);
-	}
-	/**
-	* This function stores the permissions in the correct table.
-	* Since Checkboxes are used we do not know which ones are unchecked.
-	* That's why we first delete them all (for the given user/group/role
-	* and afterwards we store the checked ones only.
-	* @param $content are we storing rights for a user, a group or a role (the database depends on it)
-	* @param $id the id of the user, group or role
-	* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
-	* @version 1.0
-	*/
-	function testStorePermissions(){
-		$content='user';
-		$id=1;
-		$res = store_permissions($content, $id);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/main/search/search_suggestions.test.php b/tests/main/search/search_suggestions.test.php
deleted file mode 100755
index 72b854ca8d..0000000000
--- a/tests/main/search/search_suggestions.test.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-require_once api_get_path(SYS_CODE_PATH).'search/search_suggestions.php';
-class TestSearch extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('Search suggestions library - main/search/search_suggestions.test.php');
-    }
-
-	function testGetSuggestionsFromSearchEngine() {
-		//ob_start();
-		$q=1;
-		$res = get_suggestions_from_search_engine($q);
-		$this->assertTrue(is_null($res));
-		//ob_end_clean();
-		//var_dump($res);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/main/webservices/user_import/import.lib.test.php b/tests/main/webservices/user_import/import.lib.test.php
deleted file mode 100755
index 7f5141bbc2..0000000000
--- a/tests/main/webservices/user_import/import.lib.test.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-require_once(api_get_path(SYS_CODE_PATH).'webservices/user_import/import.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'import.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
-
-
-class TestImpor extends UnitTestCase {
-
-    public function __construct() {
-        $this->UnitTestCase('User import WS library - main/webservices/user_import/import.lib.test.php');
-    }
-
-	function testcomplete_missing_data(){
-		$user='admin';
-		$res=complete_missing_data($user);
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
- 	* Save the imported data
-	*/
-
-	function testsave_data() {
-		global $users;
-		$res=save_data($users);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-	function testvalidate_data() {
-		global $defined_auth_sources, $users;
-		$res=validate_data($users);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-		function testparse_csv_data() {
-		$file= '/tmp/';
-		$res=parse_csv_data($file);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-/**
- * This functon only is added to the end of the test and the end of the files in the all test.
- */
-	/*public function testDeleteCourse() {
-		global $cidReq;
-		$resu = CourseManager::delete_course($cidReq);
-	}*/
-}
-?>
diff --git a/tests/main/work/work.lib.test.php b/tests/main/work/work.lib.test.php
deleted file mode 100755
index 0b490df09a..0000000000
--- a/tests/main/work/work.lib.test.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-require_once(api_get_path(SYS_CODE_PATH).'work/work.lib.php');
-require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
-
-
-class TestWork extends UnitTestCase {
-
-
-	/**
-	 * @param	string	Base work dir (.../work)
-	 * @param 	string $desiredDirName complete path of the desired name
- 	 * @return 	string actual directory name if it succeeds, boolean false
- 	 * otherwise
- 	 */
-
-	function testcreate_unexisting_work_directory() {
-		$path_name = api_get_path(SYS_COURSE_PATH);
-		$base_work_dir=$path_name.'testing/';
-		$desired_dir_name= $path_name.'testing';
-		$res=create_unexisting_work_directory($base_work_dir,$desired_dir_name);
-		$this->assertTrue(is_bool($res));
-	}
-
-
-	 /**
-	 * Builds the form thats enables the user to
-	 * select a directory to browse/upload in
-	 * This function has been copied from the document/document.inc.php library
-	 *
-	 * @param array $folders
-	 * @param string $curdirpath
-	 * @param string $group_dir
-	 * @return string html form
-	 */
-
-	function testbuild_work_directory_selector() {
-		$folders=array();
-		$curdirpath='';
-		$group_dir='';
-		$res=build_work_directory_selector($folders,$curdirpath,$group_dir='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	 /**
-	 * Builds the form thats enables the user to
-	 * move a document from one directory to another
-	 * This function has been copied from the document/document.inc.php library
-	 *
-	 * @param array $folders
-	 * @param string $curdirpath
-	 * @param string $move_file
-	 * @return string html form
-	 */
-
-	function testbuild_work_move_to_selector() {
-		$folders=array();
-		$curdirpath='';
-		$move_file='';
-		$group_dir='';
-		$res=build_work_move_to_selector($folders,$curdirpath,$move_file,$group_dir='');
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	* This function displays the number of files contained in a directory
-	* @param	string the path of the directory complete e.g. /var/www/dokeos
-	* @param	boolean true if we want the total quantity of files include in others child directorys , false only  files in the directory
-	* @return	array the first element is an integer with the number of files in the folder, the second element is the number of directories
-	*/
-
-	function testcount_dir() {
-		$path_name = api_get_path(SYS_COURSE_PATH);
-		$path_dir=$path_name;
-		$recurse=0;
-		ob_start();
-		$res=count_dir($path_dir, $recurse);
-		$this->assertTrue(is_array($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	/**
-	 * Transform an all directory structure (only directories) in an array
-	 * @param	string path of the directory
-	 * @return	array the directory structure into an array
-	 */
-
-	function testdirectory_to_array() {
-		$path_name = api_get_path(SYS_PATH);
-		$directory= $path_name;
-		$res=directory_to_array($directory);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Displays action links (for admins, authorized groups members and authorized students)
-	 * @param	string	Current dir
-	 * @param	integer	Whether to show tool options
-	 * @param	integer	Whether to show upload form option
-	 * @return	void
-	 */
-
-	function testdisplay_action_links() {
-		$cur_dir_path='';
-		$always_show_tool_options=1;
-		$always_show_upload_form=1;
-		ob_start();
-		$res=display_action_links($cur_dir_path, $always_show_tool_options, $always_show_upload_form);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	/**
-	* Displays the form where course admins can specify wether uploaded documents
-	* are visible or invisible by default.
-	*
-	* @param $uploadvisibledisabled
-	* @return html with two list radio button
-	*/
-
-	function testdisplay_default_visibility_form() {
-		$uploadvisibledisabled='';
-		ob_start();
-		$res=display_default_visibility_form($uploadvisibledisabled);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	/**
-	* Displays all options for this tool.
-	* These are
-	* - make all files visible / invisible
-	* - set the default visibility of uploaded files
-	*
-	* @param $uploadvisibledisabled
-	* @param $origin
-	* @param $base_work_dir Base working directory (up to '/work')
-	* @param $cur_dir_path	Current subdirectory of 'work/'
-	* @param $cur_dir_path_url Current subdirectory of 'work/', url-encoded
-	*/
-
-	function testdisplay_tool_options() {
-		global $charset, $group_properties,$gradebook,$base_work_dir;
-		$uploadvisibledisabled='';
-		$origin='';
-		$cur_dir_path='';
-		$cur_dir_path_url='';
-		ob_start();
-		$res=display_tool_options($uploadvisibledisabled, $origin,$base_work_dir,$cur_dir_path,$cur_dir_path_url);
-		$this->assertTrue(is_null($res));
-		ob_end_clean();
-		//var_dump($res);
-	}
-
-	/**
-	 * @param	string Path of the directory
-	 * @return	array The list of ids of all the directories in the path
-	 */
-
-	function testget_parent_directories() {
-		$my_cur_dir_path='';
-		$res=get_parent_directories($my_cur_dir_path);
-		$this->assertTrue(is_array($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Gets the id of a student publication with a given path
-	 * @param string $path
-	 * @return true if is found / false if not found
-	 */
-
-	function testget_work_id() {
-		global $cidReq;
-		$path_name = api_get_path(SYS_PATH);
-		$path=$path_name.$cidReq;
-		$res=get_work_id($path);
-		$this->assertTrue(is_bool($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Get the path of a document in the student_publication table (path relative to the course directory)
-	 * @param	integer	Element ID
-	 * @return	string	Path (or -1 on error)
-	 */
-
-	function testget_work_path() {
-		$id=1;
-		$res=get_work_path($id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Insert into the DB of the course all the directories
-	 * @param	string path of the /work directory of the course
-	 * @return	-1 on error, sql query result on success
-	 * @version April 2008
-	 */
-
-	function testinsert_all_directory_in_course_table() {
-		$path_name = api_get_path(SYS_COURSE_PATH);
-		$base_work_dir=$path_name.'work/testing';
-		$dir_to_array =directory_to_array($base_work_dir,true);
-		$res=insert_all_directory_in_course_table($base_work_dir);
-		$this->assertTrue(is_null($res));
-		//var_dump($res);
-	}
-
-
-	/**
-	* returns all the javascript that is required for easily
-	* validation when you create a work
-	* this goes into the $htmlHeadXtra[] array
-	*/
-
-	function testto_javascript_work() {
-		$res=to_javascript_work();
-		$this->assertTrue(is_string($res));
-		//var_dump($res);
-	}
-
-	/**
-	 * Update the url of a work in the student_publication table
-	 * @param	integer	ID of the work to update
-	 * @param	string	Destination directory where the work has been moved (must end with a '/')
-	 * @return	-1 on error, sql query result on success
-	 */
-
-	function testupdate_work_url() {
-		$id=1;
-		$path_name = api_get_path(SYS_COURSE_PATH);
-		$new_path=$path_name.'work/testing';
-		$res=update_work_url($id,$new_path);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-
-		/**
-	 * Delete a work-tool directory
-	 * @param	string	Base "work" directory for this course as /var/www/dokeos/courses/ABCD/work/
-	 * @param	string	The directory name as the bit after "work/", without trailing slash
-	 * @return	integer	-1 on error
-	 */
-
-
-	function testdel_dir() {
-		global $cidReq;
-		$path_name = api_get_path(SYS_PATH);
-		$base_work_dir=$path_name.$cidReq.'work/testing';
-		$dir= $path_name.'testing/';
-		$id=-1;
-		$res=del_dir($base_work_dir,$dir,$id);
-		$this->assertTrue(is_numeric($res));
-		//var_dump($res);
-	}
-}
-?>
diff --git a/tests/main_api.lib.test_standalone.php b/tests/main_api.lib.test_standalone.php
deleted file mode 100755
index 0a5614fd39..0000000000
--- a/tests/main_api.lib.test_standalone.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-/**
- * A simple set of tests for the main API.
- * @author Ivan Tcholakov, 2009.
- * @package chamilo.tests
- */
-/**
- * Init
- */
-$_current_dir = dirname(__FILE__).'/';
-
-$_sys_code_path = $_current_dir.'../main/';
-$_sys_include_path = $_sys_code_path.'inc/';
-$_sys_library_path = $_sys_code_path.'inc/lib/';
-
-$_test_sys_code_path = $_current_dir.'main/';
-$_test_sys_include_path = $_test_sys_code_path.'inc/';
-$_test_sys_library_path = $_test_sys_code_path.'inc/lib/';
-
-require_once($_current_dir.'simpletest/unit_tester.php');
-
-require_once($_sys_include_path.'global.inc.php');
-
-//header('Content-Type: text/html; charset=' . api_get_system_encoding());
-header('Content-Type: text/html; charset=' . 'UTF-8');
-
-require_once($_current_dir.'simpletest/web_tester.php');
-require_once($_current_dir.'simpletest/mock_objects.php');
-require_once($_current_dir.'simpletest/autorun.php');
-
-$_SESSION['_user']['user_id'] = 1;
-
-class MainApiTests extends TestSuite {
-
-    function  MainApiTests() {
-        $this->TestSuite('Main API Tests');
-
-        global $_test_sys_library_path;
-		$this->addTestFile($_test_sys_library_path.'main_api.lib.test_standalone.php');
-    }
-
-}
-
-$test = & new MainApiTests();
-//$test-> run( new HtmlReporter());
diff --git a/tests/phpunit/README.txt b/tests/phpunit/README.txt
deleted file mode 100755
index b30d988856..0000000000
--- a/tests/phpunit/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Do not modify these test classes by hand. They will probably get overwritten 
-with the next automatic generation. Instead, use copies of the existing files
-and suffix them with "Custom" to maintain them in the code versioning system.
-For example: AccessTestCustom.class.php
diff --git a/tests/phpunit/autoload.php b/tests/phpunit/autoload.php
deleted file mode 100755
index d0c8660866..0000000000
--- a/tests/phpunit/autoload.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-require_once dirname(__FILE__).'/../../vendor/autoload.php';
diff --git a/tests/phpunit/classes/AppendIteratorTest.class.php b/tests/phpunit/classes/AppendIteratorTest.class.php
deleted file mode 100755
index bdb09fd4b5..0000000000
--- a/tests/phpunit/classes/AppendIteratorTest.class.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:50.
- */
-class AppendIteratorTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var AppendIterator
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new AppendIterator;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers AppendIterator::append
-     * @todo   Implement testAppend().
-     */
-    public function testAppend()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::rewind
-     * @todo   Implement testRewind().
-     */
-    public function testRewind()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::valid
-     * @todo   Implement testValid().
-     */
-    public function testValid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::key
-     * @todo   Implement testKey().
-     */
-    public function testKey()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::current
-     * @todo   Implement testCurrent().
-     */
-    public function testCurrent()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::next
-     * @todo   Implement testNext().
-     */
-    public function testNext()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::getInnerIterator
-     * @todo   Implement testGetInnerIterator().
-     */
-    public function testGetInnerIterator()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::getIteratorIndex
-     * @todo   Implement testGetIteratorIndex().
-     */
-    public function testGetIteratorIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers AppendIterator::getArrayIterator
-     * @todo   Implement testGetArrayIterator().
-     */
-    public function testGetArrayIterator()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ArrayIteratorTest.class.php b/tests/phpunit/classes/ArrayIteratorTest.class.php
deleted file mode 100755
index 303514e76f..0000000000
--- a/tests/phpunit/classes/ArrayIteratorTest.class.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:51.
- */
-class ArrayIteratorTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var ArrayIterator
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new ArrayIterator;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers ArrayIterator::offsetExists
-     * @todo   Implement testOffsetExists().
-     */
-    public function testOffsetExists()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::offsetGet
-     * @todo   Implement testOffsetGet().
-     */
-    public function testOffsetGet()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::offsetSet
-     * @todo   Implement testOffsetSet().
-     */
-    public function testOffsetSet()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::offsetUnset
-     * @todo   Implement testOffsetUnset().
-     */
-    public function testOffsetUnset()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::append
-     * @todo   Implement testAppend().
-     */
-    public function testAppend()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::getArrayCopy
-     * @todo   Implement testGetArrayCopy().
-     */
-    public function testGetArrayCopy()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::count
-     * @todo   Implement testCount().
-     */
-    public function testCount()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::getFlags
-     * @todo   Implement testGetFlags().
-     */
-    public function testGetFlags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::setFlags
-     * @todo   Implement testSetFlags().
-     */
-    public function testSetFlags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::asort
-     * @todo   Implement testAsort().
-     */
-    public function testAsort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::ksort
-     * @todo   Implement testKsort().
-     */
-    public function testKsort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::uasort
-     * @todo   Implement testUasort().
-     */
-    public function testUasort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::uksort
-     * @todo   Implement testUksort().
-     */
-    public function testUksort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::natsort
-     * @todo   Implement testNatsort().
-     */
-    public function testNatsort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::natcasesort
-     * @todo   Implement testNatcasesort().
-     */
-    public function testNatcasesort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::unserialize
-     * @todo   Implement testUnserialize().
-     */
-    public function testUnserialize()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::serialize
-     * @todo   Implement testSerialize().
-     */
-    public function testSerialize()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::rewind
-     * @todo   Implement testRewind().
-     */
-    public function testRewind()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::current
-     * @todo   Implement testCurrent().
-     */
-    public function testCurrent()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::key
-     * @todo   Implement testKey().
-     */
-    public function testKey()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::next
-     * @todo   Implement testNext().
-     */
-    public function testNext()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::valid
-     * @todo   Implement testValid().
-     */
-    public function testValid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayIterator::seek
-     * @todo   Implement testSeek().
-     */
-    public function testSeek()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ArrayObjectTest.class.php b/tests/phpunit/classes/ArrayObjectTest.class.php
deleted file mode 100755
index 46298fc2a5..0000000000
--- a/tests/phpunit/classes/ArrayObjectTest.class.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:51.
- */
-class ArrayObjectTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var ArrayObject
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new ArrayObject;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers ArrayObject::offsetExists
-     * @todo   Implement testOffsetExists().
-     */
-    public function testOffsetExists()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::offsetGet
-     * @todo   Implement testOffsetGet().
-     */
-    public function testOffsetGet()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::offsetSet
-     * @todo   Implement testOffsetSet().
-     */
-    public function testOffsetSet()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::offsetUnset
-     * @todo   Implement testOffsetUnset().
-     */
-    public function testOffsetUnset()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::append
-     * @todo   Implement testAppend().
-     */
-    public function testAppend()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::getArrayCopy
-     * @todo   Implement testGetArrayCopy().
-     */
-    public function testGetArrayCopy()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::count
-     * @todo   Implement testCount().
-     */
-    public function testCount()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::getFlags
-     * @todo   Implement testGetFlags().
-     */
-    public function testGetFlags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::setFlags
-     * @todo   Implement testSetFlags().
-     */
-    public function testSetFlags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::asort
-     * @todo   Implement testAsort().
-     */
-    public function testAsort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::ksort
-     * @todo   Implement testKsort().
-     */
-    public function testKsort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::uasort
-     * @todo   Implement testUasort().
-     */
-    public function testUasort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::uksort
-     * @todo   Implement testUksort().
-     */
-    public function testUksort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::natsort
-     * @todo   Implement testNatsort().
-     */
-    public function testNatsort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::natcasesort
-     * @todo   Implement testNatcasesort().
-     */
-    public function testNatcasesort()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::unserialize
-     * @todo   Implement testUnserialize().
-     */
-    public function testUnserialize()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::serialize
-     * @todo   Implement testSerialize().
-     */
-    public function testSerialize()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::getIterator
-     * @todo   Implement testGetIterator().
-     */
-    public function testGetIterator()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::exchangeArray
-     * @todo   Implement testExchangeArray().
-     */
-    public function testExchangeArray()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::setIteratorClass
-     * @todo   Implement testSetIteratorClass().
-     */
-    public function testSetIteratorClass()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ArrayObject::getIteratorClass
-     * @todo   Implement testGetIteratorClass().
-     */
-    public function testGetIteratorClass()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ConditionalLoginTest.class.php b/tests/phpunit/classes/ConditionalLoginTest.class.php
deleted file mode 100755
index c3c6d36c22..0000000000
--- a/tests/phpunit/classes/ConditionalLoginTest.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:08.
- */
-class ConditionalLoginTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var ConditionalLogin
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new ConditionalLogin;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers ConditionalLogin::check_conditions
-     * @todo   Implement testCheck_conditions().
-     */
-    public function testCheck_conditions()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ConditionalLogin::login
-     * @todo   Implement testLogin().
-     */
-    public function testLogin()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/CustomPagesTest.class.php b/tests/phpunit/classes/CustomPagesTest.class.php
deleted file mode 100755
index a9f2988a5e..0000000000
--- a/tests/phpunit/classes/CustomPagesTest.class.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:08.
- */
-class CustomPagesTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var CustomPages
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new CustomPages;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers CustomPages::enabled
-     * @todo   Implement testEnabled().
-     */
-    public function testEnabled()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers CustomPages::path
-     * @todo   Implement testPath().
-     */
-    public function testPath()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers CustomPages::display
-     * @todo   Implement testDisplay().
-     */
-    public function testDisplay()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers CustomPages::getURLImages
-     * @todo   Implement testGetURLImages().
-     */
-    public function testGetURLImages()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/DateTimeTest.class.php b/tests/phpunit/classes/DateTimeTest.class.php
deleted file mode 100755
index 246699b962..0000000000
--- a/tests/phpunit/classes/DateTimeTest.class.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:45.
- */
-class DateTimeTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var DateTime
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new DateTime;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers DateTime::__wakeup
-     * @todo   Implement test__wakeup().
-     */
-    public function test__wakeup()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::__set_state
-     * @todo   Implement test__set_state().
-     */
-    public function test__set_state()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::createFromFormat
-     * @todo   Implement testCreateFromFormat().
-     */
-    public function testCreateFromFormat()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::getLastErrors
-     * @todo   Implement testGetLastErrors().
-     */
-    public function testGetLastErrors()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::format
-     * @todo   Implement testFormat().
-     */
-    public function testFormat()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::modify
-     * @todo   Implement testModify().
-     */
-    public function testModify()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::add
-     * @todo   Implement testAdd().
-     */
-    public function testAdd()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::sub
-     * @todo   Implement testSub().
-     */
-    public function testSub()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::getTimezone
-     * @todo   Implement testGetTimezone().
-     */
-    public function testGetTimezone()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::setTimezone
-     * @todo   Implement testSetTimezone().
-     */
-    public function testSetTimezone()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::getOffset
-     * @todo   Implement testGetOffset().
-     */
-    public function testGetOffset()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::setTime
-     * @todo   Implement testSetTime().
-     */
-    public function testSetTime()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::setDate
-     * @todo   Implement testSetDate().
-     */
-    public function testSetDate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::setISODate
-     * @todo   Implement testSetISODate().
-     */
-    public function testSetISODate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::setTimestamp
-     * @todo   Implement testSetTimestamp().
-     */
-    public function testSetTimestamp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::getTimestamp
-     * @todo   Implement testGetTimestamp().
-     */
-    public function testGetTimestamp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers DateTime::diff
-     * @todo   Implement testDiff().
-     */
-    public function testDiff()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/DirectoryTest.class.php b/tests/phpunit/classes/DirectoryTest.class.php
deleted file mode 100755
index de3058796b..0000000000
--- a/tests/phpunit/classes/DirectoryTest.class.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:55.
- */
-class DirectoryTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Directory
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Directory;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Directory::close
-     * @todo   Implement testClose().
-     */
-    public function testClose()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Directory::rewind
-     * @todo   Implement testRewind().
-     */
-    public function testRewind()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Directory::read
-     * @todo   Implement testRead().
-     */
-    public function testRead()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/DisplayTest.lib.php b/tests/phpunit/classes/DisplayTest.lib.php
deleted file mode 100755
index 94c42562f5..0000000000
--- a/tests/phpunit/classes/DisplayTest.lib.php
+++ /dev/null
@@ -1,713 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:33:51.
- */
-class DisplayTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Display
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Display;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Display::display_header
-     * @todo   Implement testDisplay_header().
-     */
-    public function testDisplay_header()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_reduced_header
-     * @todo   Implement testDisplay_reduced_header().
-     */
-    public function testDisplay_reduced_header()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_no_header
-     * @todo   Implement testDisplay_no_header().
-     */
-    public function testDisplay_no_header()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::set_header
-     * @todo   Implement testSet_header().
-     */
-    public function testSet_header()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_footer
-     * @todo   Implement testDisplay_footer().
-     */
-    public function testDisplay_footer()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page
-     * @todo   Implement testPage().
-     */
-    public function testPage()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_introduction_section
-     * @todo   Implement testDisplay_introduction_section().
-     */
-    public function testDisplay_introduction_section()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::return_introduction_section
-     * @todo   Implement testReturn_introduction_section().
-     */
-    public function testReturn_introduction_section()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_localised_html_file
-     * @todo   Implement testDisplay_localised_html_file().
-     */
-    public function testDisplay_localised_html_file()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_sortable_table
-     * @todo   Implement testDisplay_sortable_table().
-     */
-    public function testDisplay_sortable_table()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_sortable_grid
-     * @todo   Implement testDisplay_sortable_grid().
-     */
-    public function testDisplay_sortable_grid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::return_sortable_grid
-     * @todo   Implement testReturn_sortable_grid().
-     */
-    public function testReturn_sortable_grid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_sortable_config_table
-     * @todo   Implement testDisplay_sortable_config_table().
-     */
-    public function testDisplay_sortable_config_table()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_normal_message
-     * @todo   Implement testDisplay_normal_message().
-     */
-    public function testDisplay_normal_message()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_warning_message
-     * @todo   Implement testDisplay_warning_message().
-     */
-    public function testDisplay_warning_message()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_confirmation_message
-     * @todo   Implement testDisplay_confirmation_message().
-     */
-    public function testDisplay_confirmation_message()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::display_error_message
-     * @todo   Implement testDisplay_error_message().
-     */
-    public function testDisplay_error_message()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::return_message_and_translate
-     * @todo   Implement testReturn_message_and_translate().
-     */
-    public function testReturn_message_and_translate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::return_message
-     * @todo   Implement testReturn_message().
-     */
-    public function testReturn_message()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::encrypted_mailto_link
-     * @todo   Implement testEncrypted_mailto_link().
-     */
-    public function testEncrypted_mailto_link()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::icon_mailto_link
-     * @todo   Implement testIcon_mailto_link().
-     */
-    public function testIcon_mailto_link()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::get_alphabet_options
-     * @todo   Implement testGet_alphabet_options().
-     */
-    public function testGet_alphabet_options()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::get_numeric_options
-     * @todo   Implement testGet_numeric_options().
-     */
-    public function testGet_numeric_options()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-
-    /**
-     * @covers Display::display_icon
-     * @todo   Implement testDisplay_icon().
-     */
-    public function testDisplay_icon()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::return_icon
-     * @todo   Implement testReturn_icon().
-     */
-    public function testReturn_icon()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::img
-     * @todo   Implement testImg().
-     */
-    public function testImg()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::tag
-     * @todo   Implement testTag().
-     */
-    public function testTag()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::url
-     * @todo   Implement testUrl().
-     */
-    public function testUrl()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::div
-     * @todo   Implement testDiv().
-     */
-    public function testDiv()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::span
-     * @todo   Implement testSpan().
-     */
-    public function testSpan()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::input
-     * @todo   Implement testInput().
-     */
-    public function testInput()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::button
-     * @todo   Implement testButton().
-     */
-    public function testButton()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::select
-     * @todo   Implement testSelect().
-     */
-    public function testSelect()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::tabs
-     * @todo   Implement testTabs().
-     */
-    public function testTabs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::tabs_only_link
-     * @todo   Implement testTabs_only_link().
-     */
-    public function testTabs_only_link()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::grid_html
-     * @todo   Implement testGrid_html().
-     */
-    public function testGrid_html()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::form_row
-     * @todo   Implement testForm_row().
-     */
-    public function testForm_row()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::grid_js
-     * @todo   Implement testGrid_js().
-     */
-    public function testGrid_js()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::table
-     * @todo   Implement testTable().
-     */
-    public function testTable()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::show_notification
-     * @todo   Implement testShow_notification().
-     */
-    public function testShow_notification()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::get_session_title_box
-     * @todo   Implement testGet_session_title_box().
-     */
-    public function testGet_session_title_box()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::return_rating_system
-     * @todo   Implement testReturn_rating_system().
-     */
-    public function testReturn_rating_system()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page_header
-     * @todo   Implement testPage_header().
-     */
-    public function testPage_header()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page_header_and_translate
-     * @todo   Implement testPage_header_and_translate().
-     */
-    public function testPage_header_and_translate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page_subheader_and_translate
-     * @todo   Implement testPage_subheader_and_translate().
-     */
-    public function testPage_subheader_and_translate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page_subheader
-     * @todo   Implement testPage_subheader().
-     */
-    public function testPage_subheader()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page_subheader2
-     * @todo   Implement testPage_subheader2().
-     */
-    public function testPage_subheader2()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::page_subheader3
-     * @todo   Implement testPage_subheader3().
-     */
-    public function testPage_subheader3()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::description
-     * @todo   Implement testDescription().
-     */
-    public function testDescription()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::bar_progress
-     * @todo   Implement testBar_progress().
-     */
-    public function testBar_progress()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::badge
-     * @todo   Implement testBadge().
-     */
-    public function testBadge()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::badge_group
-     * @todo   Implement testBadge_group().
-     */
-    public function testBadge_group()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::label
-     * @todo   Implement testLabel().
-     */
-    public function testLabel()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::actions
-     * @todo   Implement testActions().
-     */
-    public function testActions()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::tip
-     * @todo   Implement testTip().
-     */
-    public function testTip()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::generate_accordion
-     * @todo   Implement testGenerate_accordion().
-     */
-    public function testGenerate_accordion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Display::group_button
-     * @todo   Implement testGroup_button().
-     */
-    public function testGroup_button()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/EmptyIteratorTest.class.php b/tests/phpunit/classes/EmptyIteratorTest.class.php
deleted file mode 100755
index 0649c9dc68..0000000000
--- a/tests/phpunit/classes/EmptyIteratorTest.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:51.
- */
-class EmptyIteratorTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var EmptyIterator
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new EmptyIterator;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers EmptyIterator::rewind
-     * @todo   Implement testRewind().
-     */
-    public function testRewind()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers EmptyIterator::valid
-     * @todo   Implement testValid().
-     */
-    public function testValid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers EmptyIterator::key
-     * @todo   Implement testKey().
-     */
-    public function testKey()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers EmptyIterator::current
-     * @todo   Implement testCurrent().
-     */
-    public function testCurrent()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers EmptyIterator::next
-     * @todo   Implement testNext().
-     */
-    public function testNext()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ErrorExceptionTest.class.php b/tests/phpunit/classes/ErrorExceptionTest.class.php
deleted file mode 100755
index 0653ece1ff..0000000000
--- a/tests/phpunit/classes/ErrorExceptionTest.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:45.
- */
-class ErrorExceptionTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var ErrorException
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new ErrorException;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers ErrorException::getSeverity
-     * @todo   Implement testGetSeverity().
-     */
-    public function testGetSeverity()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/EventsMailTest.class.php b/tests/phpunit/classes/EventsMailTest.class.php
deleted file mode 100755
index 78db857824..0000000000
--- a/tests/phpunit/classes/EventsMailTest.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:08.
- */
-class EventsMailTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var EventsMail
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new EventsMail;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers EventsMail::send_mail
-     * @todo   Implement testSend_mail().
-     */
-    public function testSend_mail()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers EventsMail::check_if_using_class
-     * @todo   Implement testCheck_if_using_class().
-     */
-    public function testCheck_if_using_class()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ExceptionTest.class.php b/tests/phpunit/classes/ExceptionTest.class.php
deleted file mode 100755
index 817906b6cc..0000000000
--- a/tests/phpunit/classes/ExceptionTest.class.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:45.
- */
-class ExceptionTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Exception
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Exception;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Exception::getMessage
-     * @todo   Implement testGetMessage().
-     */
-    public function testGetMessage()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::getCode
-     * @todo   Implement testGetCode().
-     */
-    public function testGetCode()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::getFile
-     * @todo   Implement testGetFile().
-     */
-    public function testGetFile()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::getLine
-     * @todo   Implement testGetLine().
-     */
-    public function testGetLine()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::getTrace
-     * @todo   Implement testGetTrace().
-     */
-    public function testGetTrace()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::getPrevious
-     * @todo   Implement testGetPrevious().
-     */
-    public function testGetPrevious()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::getTraceAsString
-     * @todo   Implement testGetTraceAsString().
-     */
-    public function testGetTraceAsString()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Exception::__toString
-     * @todo   Implement test__toString().
-     */
-    public function test__toString()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ImportTest.class.php b/tests/phpunit/classes/ImportTest.class.php
deleted file mode 100755
index 3d370ff9b4..0000000000
--- a/tests/phpunit/classes/ImportTest.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:29:52.
- */
-class ImportTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Import
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Import;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Import::csv_reader
-     * @todo   Implement testCsv_reader().
-     */
-    public function testCsv_reader()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Import::csvToArray
-     * @todo   Implement testcsvToArray().
-     */
-    public function testcsvToArray()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/LocaleTest.class.php b/tests/phpunit/classes/LocaleTest.class.php
deleted file mode 100755
index e65a446f81..0000000000
--- a/tests/phpunit/classes/LocaleTest.class.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:56.
- */
-class LocaleTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Locale
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Locale;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Locale::getDefault
-     * @todo   Implement testGetDefault().
-     */
-    public function testGetDefault()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::setDefault
-     * @todo   Implement testSetDefault().
-     */
-    public function testSetDefault()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getPrimaryLanguage
-     * @todo   Implement testGetPrimaryLanguage().
-     */
-    public function testGetPrimaryLanguage()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getScript
-     * @todo   Implement testGetScript().
-     */
-    public function testGetScript()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getRegion
-     * @todo   Implement testGetRegion().
-     */
-    public function testGetRegion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getKeywords
-     * @todo   Implement testGetKeywords().
-     */
-    public function testGetKeywords()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getDisplayScript
-     * @todo   Implement testGetDisplayScript().
-     */
-    public function testGetDisplayScript()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getDisplayRegion
-     * @todo   Implement testGetDisplayRegion().
-     */
-    public function testGetDisplayRegion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getDisplayName
-     * @todo   Implement testGetDisplayName().
-     */
-    public function testGetDisplayName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getDisplayLanguage
-     * @todo   Implement testGetDisplayLanguage().
-     */
-    public function testGetDisplayLanguage()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getDisplayVariant
-     * @todo   Implement testGetDisplayVariant().
-     */
-    public function testGetDisplayVariant()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::composeLocale
-     * @todo   Implement testComposeLocale().
-     */
-    public function testComposeLocale()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::parseLocale
-     * @todo   Implement testParseLocale().
-     */
-    public function testParseLocale()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::getAllVariants
-     * @todo   Implement testGetAllVariants().
-     */
-    public function testGetAllVariants()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::filterMatches
-     * @todo   Implement testFilterMatches().
-     */
-    public function testFilterMatches()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::lookup
-     * @todo   Implement testLookup().
-     */
-    public function testLookup()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::canonicalize
-     * @todo   Implement testCanonicalize().
-     */
-    public function testCanonicalize()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Locale::acceptFromHttp
-     * @todo   Implement testAcceptFromHttp().
-     */
-    public function testAcceptFromHttp()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/LoginRedirectionTest.class.php b/tests/phpunit/classes/LoginRedirectionTest.class.php
deleted file mode 100755
index e67dc89fc8..0000000000
--- a/tests/phpunit/classes/LoginRedirectionTest.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:09.
- */
-class LoginRedirectionTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var LoginRedirection
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new LoginRedirection;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers LoginRedirection::redirect
-     * @todo   Implement testRedirect().
-     */
-    public function testRedirect()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/MultipleIteratorTest.class.php b/tests/phpunit/classes/MultipleIteratorTest.class.php
deleted file mode 100755
index a13361a0d2..0000000000
--- a/tests/phpunit/classes/MultipleIteratorTest.class.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:53.
- */
-class MultipleIteratorTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var MultipleIterator
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new MultipleIterator;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers MultipleIterator::getFlags
-     * @todo   Implement testGetFlags().
-     */
-    public function testGetFlags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::setFlags
-     * @todo   Implement testSetFlags().
-     */
-    public function testSetFlags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::attachIterator
-     * @todo   Implement testAttachIterator().
-     */
-    public function testAttachIterator()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::detachIterator
-     * @todo   Implement testDetachIterator().
-     */
-    public function testDetachIterator()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::containsIterator
-     * @todo   Implement testContainsIterator().
-     */
-    public function testContainsIterator()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::countIterators
-     * @todo   Implement testCountIterators().
-     */
-    public function testCountIterators()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::rewind
-     * @todo   Implement testRewind().
-     */
-    public function testRewind()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::valid
-     * @todo   Implement testValid().
-     */
-    public function testValid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::key
-     * @todo   Implement testKey().
-     */
-    public function testKey()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::current
-     * @todo   Implement testCurrent().
-     */
-    public function testCurrent()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers MultipleIterator::next
-     * @todo   Implement testNext().
-     */
-    public function testNext()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/NormalizerTest.class.php b/tests/phpunit/classes/NormalizerTest.class.php
deleted file mode 100755
index 087e82d458..0000000000
--- a/tests/phpunit/classes/NormalizerTest.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:56.
- */
-class NormalizerTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Normalizer
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Normalizer;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Normalizer::normalize
-     * @todo   Implement testNormalize().
-     */
-    public function testNormalize()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Normalizer::isNormalized
-     * @todo   Implement testIsNormalized().
-     */
-    public function testIsNormalized()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/RightsTest.class.php b/tests/phpunit/classes/RightsTest.class.php
deleted file mode 100755
index 5d428e64d9..0000000000
--- a/tests/phpunit/classes/RightsTest.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:29:54.
- */
-class RightsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Rights
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Rights;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers Rights::hasRight
-     * @todo   Implement testHasRight().
-     */
-    public function testHasRight()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Rights::hasRightClosePageWithError
-     * @todo   Implement testHasRightClosePageWithError().
-     */
-    public function testHasRightClosePageWithError()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/SessionHandlerTest.class.php b/tests/phpunit/classes/SessionHandlerTest.class.php
deleted file mode 100755
index 7b5f0c1ee0..0000000000
--- a/tests/phpunit/classes/SessionHandlerTest.class.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:09.
- */
-class SessionHandlerTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var SessionHandler
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new SessionHandler;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers SessionHandler::sqlConnect
-     * @todo   Implement testSqlConnect().
-     */
-    public function testSqlConnect()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::sqlClose
-     * @todo   Implement testSqlClose().
-     */
-    public function testSqlClose()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::sqlQuery
-     * @todo   Implement testSqlQuery().
-     */
-    public function testSqlQuery()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::open
-     * @todo   Implement testOpen().
-     */
-    public function testOpen()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::close
-     * @todo   Implement testClose().
-     */
-    public function testClose()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::read
-     * @todo   Implement testRead().
-     */
-    public function testRead()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::write
-     * @todo   Implement testWrite().
-     */
-    public function testWrite()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::destroy
-     * @todo   Implement testDestroy().
-     */
-    public function testDestroy()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionHandler::garbage
-     * @todo   Implement testGarbage().
-     */
-    public function testGarbage()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/SessionManager.lib.php b/tests/phpunit/classes/SessionManager.lib.php
deleted file mode 100755
index 5bd088dac9..0000000000
--- a/tests/phpunit/classes/SessionManager.lib.php
+++ /dev/null
@@ -1,532 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:34:57.
- */
-class SessionManagerTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var SessionManager
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new SessionManager;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers SessionManager::fetch
-     * @todo   Implement testFetch().
-     */
-    public function testFetch()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::create_session
-     * @todo   Implement testCreate_session().
-     */
-    public function testCreate_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::session_name_exists
-     * @todo   Implement testSession_name_exists().
-     */
-    public function testSession_name_exists()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_count_admin
-     * @todo   Implement testGet_count_admin().
-     */
-    public function testGet_count_admin()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_sessions_admin
-     * @todo   Implement testGet_sessions_admin().
-     */
-    public function testGet_sessions_admin()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::generateNextSessionName
-     * @todo   Implement testGenerate_nice_next_session_name().
-     */
-    public function testGenerateNextSessionName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::edit_session
-     * @todo   Implement testEdit_session().
-     */
-    public function testEdit_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::delete_session
-     * @todo   Implement testDelete_session().
-     */
-    public function testDelete_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::subscribe_users_to_session
-     * @todo   Implement testSubscribe_users_to_session().
-     */
-    public function testSubscribe_users_to_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::subscribe_users_to_session_course
-     * @todo   Implement testSubscribe_users_to_session_course().
-     */
-    public function testSubscribe_users_to_session_course()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::unsubscribe_user_from_session
-     * @todo   Implement testUnsubscribe_user_from_session().
-     */
-    public function testUnsubscribe_user_from_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::add_courses_to_session
-     * @todo   Implement testAdd_courses_to_session().
-     */
-    public function testAdd_courses_to_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::unsubscribe_course_from_session
-     * @todo   Implement testUnsubscribe_course_from_session().
-     */
-    public function testUnsubscribe_course_from_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::create_session_extra_field
-     * @todo   Implement testCreate_session_extra_field().
-     */
-    public function testCreate_session_extra_field()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::update_session_extra_field_value
-     * @todo   Implement testUpdate_session_extra_field_value().
-     */
-    public function testUpdate_session_extra_field_value()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::relation_session_course_exist
-     * @todo   Implement testRelation_session_course_exist().
-     */
-    public function testRelation_session_course_exist()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_session_by_name
-     * @todo   Implement testGet_session_by_name().
-     */
-    public function testGet_session_by_name()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::create_category_session
-     * @todo   Implement testCreate_category_session().
-     */
-    public function testCreate_category_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::edit_category_session
-     * @todo   Implement testEdit_category_session().
-     */
-    public function testEdit_category_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::delete_session_category
-     * @todo   Implement testDelete_session_category().
-     */
-    public function testDelete_session_category()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_sessions_list
-     * @todo   Implement testGet_sessions_list().
-     */
-    public function testGet_sessions_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_session_category
-     * @todo   Implement testGet_session_category().
-     */
-    public function testGet_session_category()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_all_session_category
-     * @todo   Implement testGet_all_session_category().
-     */
-    public function testGet_all_session_category()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::set_coach_to_course_session
-     * @todo   Implement testSet_coach_to_course_session().
-     */
-    public function testSet_coach_to_course_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::suscribe_sessions_to_hr_manager
-     * @todo   Implement testSuscribe_sessions_to_hr_manager().
-     */
-    public function testSuscribe_sessions_to_hr_manager()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_sessions_followed_by_drh
-     * @todo   Implement testGet_sessions_followed_by_drh().
-     */
-    public function testGet_sessions_followed_by_drh()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_course_list_by_session_id
-     * @todo   Implement testGet_course_list_by_session_id().
-     */
-    public function testGet_course_list_by_session_id()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_session_id_from_original_id
-     * @todo   Implement testGet_session_id_from_original_id().
-     */
-    public function testGet_session_id_from_original_id()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_users_by_session
-     * @todo   Implement testGet_users_by_session().
-     */
-    public function testGet_users_by_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_sessions_by_general_coach
-     * @todo   Implement testGet_sessions_by_general_coach().
-     */
-    public function testGet_sessions_by_general_coach()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_sessions_by_coach
-     * @todo   Implement testGet_sessions_by_coach().
-     */
-    public function testGet_sessions_by_coach()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_user_status_in_course_session
-     * @todo   Implement testGet_user_status_in_course_session().
-     */
-    public function testGet_user_status_in_course_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_user_status_in_session
-     * @todo   Implement testGet_user_status_in_session().
-     */
-    public function testGet_user_status_in_session()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_all_sessions_by_promotion
-     * @todo   Implement testGet_all_sessions_by_promotion().
-     */
-    public function testGet_all_sessions_by_promotion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::subscribe_sessions_to_promotion
-     * @todo   Implement testSubscribe_sessions_to_promotion().
-     */
-    public function testSubscribe_sessions_to_promotion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::set_session_status
-     * @todo   Implement testSet_session_status().
-     */
-    public function testSet_session_status()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::copy
-     * @todo   Implement testCopy_session().
-     */
-    public function testCopy()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::user_is_general_coach
-     * @todo   Implement testUser_is_general_coach().
-     */
-    public function testUser_is_general_coach()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::count_sessions
-     * @todo   Implement testCount_sessions().
-     */
-    public function testCount_sessions()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::protect_session_edit
-     * @todo   Implement testProtect_session_edit().
-     */
-    public function testProtect_session_edit()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_session_by_course
-     * @todo   Implement testGet_session_by_course().
-     */
-    public function testGet_session_by_course()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers SessionManager::get_sessions_by_user
-     * @todo   Implement testGet_sessions_by_user().
-     */
-    public function testGet_sessions_by_user()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/TableSortTest.class.php b/tests/phpunit/classes/TableSortTest.class.php
deleted file mode 100755
index 28205b67c2..0000000000
--- a/tests/phpunit/classes/TableSortTest.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:10.
- */
-class TableSortTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var TableSort
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new TableSort;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers TableSort::sort_table
-     * @todo   Implement testSort_table().
-     */
-    public function testSort_table()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers TableSort::sort_table_config
-     * @todo   Implement testSort_table_config().
-     */
-    public function testSort_table_config()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/UserApiKeyManagerTest.class.php b/tests/phpunit/classes/UserApiKeyManagerTest.class.php
deleted file mode 100755
index 8853a20021..0000000000
--- a/tests/phpunit/classes/UserApiKeyManagerTest.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 14:44:10.
- */
-class UserApiKeyManagerTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var UserApiKeyManager
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new UserApiKeyManager;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers UserApiKeyManager::default_service
-     * @todo   Implement testDefault_service().
-     */
-    public function testDefault_service()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers UserApiKeyManager::end_of_time
-     * @todo   Implement testEnd_of_time().
-     */
-    public function testEnd_of_time()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers UserApiKeyManager::get_by_id
-     * @todo   Implement testGet_by_id().
-     */
-    public function testGet_by_id()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers UserApiKeyManager::create_temp_token
-     * @todo   Implement testCreate_temp_token().
-     */
-    public function testCreate_temp_token()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers UserApiKeyManager::create_token
-     * @todo   Implement testCreate_token().
-     */
-    public function testCreate_token()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/XMLReaderTest.class.php b/tests/phpunit/classes/XMLReaderTest.class.php
deleted file mode 100755
index 5c5bf032b6..0000000000
--- a/tests/phpunit/classes/XMLReaderTest.class.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:55.
- */
-class XMLReaderTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var XMLReader
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new XMLReader;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers XMLReader::close
-     * @todo   Implement testClose().
-     */
-    public function testClose()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::getAttribute
-     * @todo   Implement testGetAttribute().
-     */
-    public function testGetAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::getAttributeNo
-     * @todo   Implement testGetAttributeNo().
-     */
-    public function testGetAttributeNo()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::getAttributeNs
-     * @todo   Implement testGetAttributeNs().
-     */
-    public function testGetAttributeNs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::getParserProperty
-     * @todo   Implement testGetParserProperty().
-     */
-    public function testGetParserProperty()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::isValid
-     * @todo   Implement testIsValid().
-     */
-    public function testIsValid()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::lookupNamespace
-     * @todo   Implement testLookupNamespace().
-     */
-    public function testLookupNamespace()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::moveToAttributeNo
-     * @todo   Implement testMoveToAttributeNo().
-     */
-    public function testMoveToAttributeNo()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::moveToAttribute
-     * @todo   Implement testMoveToAttribute().
-     */
-    public function testMoveToAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::moveToAttributeNs
-     * @todo   Implement testMoveToAttributeNs().
-     */
-    public function testMoveToAttributeNs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::moveToElement
-     * @todo   Implement testMoveToElement().
-     */
-    public function testMoveToElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::moveToFirstAttribute
-     * @todo   Implement testMoveToFirstAttribute().
-     */
-    public function testMoveToFirstAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::moveToNextAttribute
-     * @todo   Implement testMoveToNextAttribute().
-     */
-    public function testMoveToNextAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::open
-     * @todo   Implement testOpen().
-     */
-    public function testOpen()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::read
-     * @todo   Implement testRead().
-     */
-    public function testRead()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::next
-     * @todo   Implement testNext().
-     */
-    public function testNext()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::readInnerXml
-     * @todo   Implement testReadInnerXml().
-     */
-    public function testReadInnerXml()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::readOuterXml
-     * @todo   Implement testReadOuterXml().
-     */
-    public function testReadOuterXml()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::readString
-     * @todo   Implement testReadString().
-     */
-    public function testReadString()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::setSchema
-     * @todo   Implement testSetSchema().
-     */
-    public function testSetSchema()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::setParserProperty
-     * @todo   Implement testSetParserProperty().
-     */
-    public function testSetParserProperty()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::setRelaxNGSchema
-     * @todo   Implement testSetRelaxNGSchema().
-     */
-    public function testSetRelaxNGSchema()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::setRelaxNGSchemaSource
-     * @todo   Implement testSetRelaxNGSchemaSource().
-     */
-    public function testSetRelaxNGSchemaSource()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::XML
-     * @todo   Implement testXML().
-     */
-    public function testXML()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLReader::expand
-     * @todo   Implement testExpand().
-     */
-    public function testExpand()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/XMLWriterTest.class.php b/tests/phpunit/classes/XMLWriterTest.class.php
deleted file mode 100755
index 8356ab7168..0000000000
--- a/tests/phpunit/classes/XMLWriterTest.class.php
+++ /dev/null
@@ -1,532 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:55.
- */
-class XMLWriterTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var XMLWriter
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new XMLWriter;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers XMLWriter::openUri
-     * @todo   Implement testOpenUri().
-     */
-    public function testOpenUri()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::openMemory
-     * @todo   Implement testOpenMemory().
-     */
-    public function testOpenMemory()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::setIndent
-     * @todo   Implement testSetIndent().
-     */
-    public function testSetIndent()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::setIndentString
-     * @todo   Implement testSetIndentString().
-     */
-    public function testSetIndentString()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startComment
-     * @todo   Implement testStartComment().
-     */
-    public function testStartComment()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endComment
-     * @todo   Implement testEndComment().
-     */
-    public function testEndComment()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startAttribute
-     * @todo   Implement testStartAttribute().
-     */
-    public function testStartAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endAttribute
-     * @todo   Implement testEndAttribute().
-     */
-    public function testEndAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeAttribute
-     * @todo   Implement testWriteAttribute().
-     */
-    public function testWriteAttribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startAttributeNs
-     * @todo   Implement testStartAttributeNs().
-     */
-    public function testStartAttributeNs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeAttributeNs
-     * @todo   Implement testWriteAttributeNs().
-     */
-    public function testWriteAttributeNs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startElement
-     * @todo   Implement testStartElement().
-     */
-    public function testStartElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endElement
-     * @todo   Implement testEndElement().
-     */
-    public function testEndElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::fullEndElement
-     * @todo   Implement testFullEndElement().
-     */
-    public function testFullEndElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startElementNs
-     * @todo   Implement testStartElementNs().
-     */
-    public function testStartElementNs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeElement
-     * @todo   Implement testWriteElement().
-     */
-    public function testWriteElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeElementNs
-     * @todo   Implement testWriteElementNs().
-     */
-    public function testWriteElementNs()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startPi
-     * @todo   Implement testStartPi().
-     */
-    public function testStartPi()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endPi
-     * @todo   Implement testEndPi().
-     */
-    public function testEndPi()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writePi
-     * @todo   Implement testWritePi().
-     */
-    public function testWritePi()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startCdata
-     * @todo   Implement testStartCdata().
-     */
-    public function testStartCdata()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endCdata
-     * @todo   Implement testEndCdata().
-     */
-    public function testEndCdata()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeCdata
-     * @todo   Implement testWriteCdata().
-     */
-    public function testWriteCdata()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::text
-     * @todo   Implement testText().
-     */
-    public function testText()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeRaw
-     * @todo   Implement testWriteRaw().
-     */
-    public function testWriteRaw()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startDocument
-     * @todo   Implement testStartDocument().
-     */
-    public function testStartDocument()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endDocument
-     * @todo   Implement testEndDocument().
-     */
-    public function testEndDocument()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeComment
-     * @todo   Implement testWriteComment().
-     */
-    public function testWriteComment()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startDtd
-     * @todo   Implement testStartDtd().
-     */
-    public function testStartDtd()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endDtd
-     * @todo   Implement testEndDtd().
-     */
-    public function testEndDtd()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeDtd
-     * @todo   Implement testWriteDtd().
-     */
-    public function testWriteDtd()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startDtdElement
-     * @todo   Implement testStartDtdElement().
-     */
-    public function testStartDtdElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endDtdElement
-     * @todo   Implement testEndDtdElement().
-     */
-    public function testEndDtdElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeDtdElement
-     * @todo   Implement testWriteDtdElement().
-     */
-    public function testWriteDtdElement()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startDtdAttlist
-     * @todo   Implement testStartDtdAttlist().
-     */
-    public function testStartDtdAttlist()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endDtdAttlist
-     * @todo   Implement testEndDtdAttlist().
-     */
-    public function testEndDtdAttlist()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeDtdAttlist
-     * @todo   Implement testWriteDtdAttlist().
-     */
-    public function testWriteDtdAttlist()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::startDtdEntity
-     * @todo   Implement testStartDtdEntity().
-     */
-    public function testStartDtdEntity()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::endDtdEntity
-     * @todo   Implement testEndDtdEntity().
-     */
-    public function testEndDtdEntity()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::writeDtdEntity
-     * @todo   Implement testWriteDtdEntity().
-     */
-    public function testWriteDtdEntity()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::outputMemory
-     * @todo   Implement testOutputMemory().
-     */
-    public function testOutputMemory()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers XMLWriter::flush
-     * @todo   Implement testFlush().
-     */
-    public function testFlush()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/ZipArchiveTest.class.php b/tests/phpunit/classes/ZipArchiveTest.class.php
deleted file mode 100755
index 8724005ade..0000000000
--- a/tests/phpunit/classes/ZipArchiveTest.class.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:55.
- */
-class ZipArchiveTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var ZipArchive
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new ZipArchive;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers ZipArchive::open
-     * @todo   Implement testOpen().
-     */
-    public function testOpen()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::close
-     * @todo   Implement testClose().
-     */
-    public function testClose()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getStatusString
-     * @todo   Implement testGetStatusString().
-     */
-    public function testGetStatusString()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::addEmptyDir
-     * @todo   Implement testAddEmptyDir().
-     */
-    public function testAddEmptyDir()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::addFromString
-     * @todo   Implement testAddFromString().
-     */
-    public function testAddFromString()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::addFile
-     * @todo   Implement testAddFile().
-     */
-    public function testAddFile()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::addGlob
-     * @todo   Implement testAddGlob().
-     */
-    public function testAddGlob()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::addPattern
-     * @todo   Implement testAddPattern().
-     */
-    public function testAddPattern()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::renameIndex
-     * @todo   Implement testRenameIndex().
-     */
-    public function testRenameIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::renameName
-     * @todo   Implement testRenameName().
-     */
-    public function testRenameName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::setArchiveComment
-     * @todo   Implement testSetArchiveComment().
-     */
-    public function testSetArchiveComment()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getArchiveComment
-     * @todo   Implement testGetArchiveComment().
-     */
-    public function testGetArchiveComment()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::setCommentIndex
-     * @todo   Implement testSetCommentIndex().
-     */
-    public function testSetCommentIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::setCommentName
-     * @todo   Implement testSetCommentName().
-     */
-    public function testSetCommentName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getCommentIndex
-     * @todo   Implement testGetCommentIndex().
-     */
-    public function testGetCommentIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getCommentName
-     * @todo   Implement testGetCommentName().
-     */
-    public function testGetCommentName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::deleteIndex
-     * @todo   Implement testDeleteIndex().
-     */
-    public function testDeleteIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::deleteName
-     * @todo   Implement testDeleteName().
-     */
-    public function testDeleteName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::statName
-     * @todo   Implement testStatName().
-     */
-    public function testStatName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::statIndex
-     * @todo   Implement testStatIndex().
-     */
-    public function testStatIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::locateName
-     * @todo   Implement testLocateName().
-     */
-    public function testLocateName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getNameIndex
-     * @todo   Implement testGetNameIndex().
-     */
-    public function testGetNameIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::unchangeArchive
-     * @todo   Implement testUnchangeArchive().
-     */
-    public function testUnchangeArchive()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::unchangeAll
-     * @todo   Implement testUnchangeAll().
-     */
-    public function testUnchangeAll()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::unchangeIndex
-     * @todo   Implement testUnchangeIndex().
-     */
-    public function testUnchangeIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::unchangeName
-     * @todo   Implement testUnchangeName().
-     */
-    public function testUnchangeName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::extractTo
-     * @todo   Implement testExtractTo().
-     */
-    public function testExtractTo()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getFromName
-     * @todo   Implement testGetFromName().
-     */
-    public function testGetFromName()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getFromIndex
-     * @todo   Implement testGetFromIndex().
-     */
-    public function testGetFromIndex()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ZipArchive::getStream
-     * @todo   Implement testGetStream().
-     */
-    public function testGetStream()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/finfoTest.class.php b/tests/phpunit/classes/finfoTest.class.php
deleted file mode 100755
index 9cc2331d69..0000000000
--- a/tests/phpunit/classes/finfoTest.class.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:48.
- */
-class finfoTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var finfo
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new finfo;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers finfo::set_flags
-     * @todo   Implement testSet_flags().
-     */
-    public function testSet_flags()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers finfo::file
-     * @todo   Implement testFile().
-     */
-    public function testFile()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers finfo::buffer
-     * @todo   Implement testBuffer().
-     */
-    public function testBuffer()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/classes/php_user_filterTest.class.php b/tests/phpunit/classes/php_user_filterTest.class.php
deleted file mode 100755
index cd7fb55806..0000000000
--- a/tests/phpunit/classes/php_user_filterTest.class.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-01-07 at 09:22:55.
- */
-class php_user_filterTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var php_user_filter
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new php_user_filter;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers php_user_filter::filter
-     * @todo   Implement testFilter().
-     */
-    public function testFilter()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers php_user_filter::onCreate
-     * @todo   Implement testOnCreate().
-     */
-    public function testOnCreate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers php_user_filter::onClose
-     * @todo   Implement testOnClose().
-     */
-    public function testOnClose()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/phpunit/generate_test_classes.php b/tests/phpunit/generate_test_classes.php
deleted file mode 100755
index 3bcf876568..0000000000
--- a/tests/phpunit/generate_test_classes.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * This script is used to generate test classes automatically from the phpunit
- * documentation in PHPDoc blocks
- */
-/**
- * Initialization
- */
-$codedir = dirname(__FILE__).'/../../main/';
-require $codedir.'inc/global.inc.php';
-$libdir = $codedir.'inc/lib/';
-$listfiles = scandir($libdir);
-$declared = get_declared_classes();
-// List of exclusions for classes not yet used
-$excludes = array('entity_repository.class.php','course_entity_repository.class.php');
-foreach ($listfiles as $file) {
-  // we don't want folders for now
-  if (is_dir($libdir.$file) || substr($file,0,1)=='.') { continue; }
-  // we only want files ending in '.class.php'
-  if (substr($file,-9) != 'class.php') { continue; }
-  // excluding special cases
-  if (in_array($file,$excludes)) { continue; }
-  // all good, now proceeding with valid classes
-  echo "Including ".$libdir.$file." unless it has already been included...\n";
-  include_once $libdir.$file;
-  $newdeclared = get_declared_classes();
-  $newclasses = array_diff($newdeclared, $declared);
-  foreach ($newclasses as $newclass) {
-    $declared[] = $newclass;
-    // Generate the call to phpunit-skelgen
-    system('phpunit-skelgen --test -- '.$newclass.' '.$libdir.$file.' '.$newclass.'Test '.$codedir.'/../tests/phpunit/classes/'.$newclass.'Test.class.php');
-  }
-}
diff --git a/tests/phpunit/phpunit.xml b/tests/phpunit/phpunit.xml
deleted file mode 100755
index d538b6595b..0000000000
--- a/tests/phpunit/phpunit.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="autoload.php" backupGlobals="false"
-         backupStaticAttributes="false" verbose="true">
-  <testsuites>
-    <testsuite name="Chamilo LMS classes">
-      <directory suffix="Test.class.php">../phpunit/classes</directory>
-      <directory suffix="Test.lib.php">../phpunit/classes</directory>
-    </testsuite>
-  </testsuites>
-  <!--logging-->
-    <!--log type="coverage-clover" target="../logs/clover.xml"/-->
-    <!--log type="coverage-html" target="../coverage" title="ChamiloTests"/-->
-    <!--log type="junit" target="../logs/junit.xml" logIncompleteSkipped="false"/-->
-  <!--/logging-->
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../../main/inc</directory>
-      <exclude>
-        <!--file>autoload.inc.php</file-->
-        <!--file>global.inc.php</file-->
-      </exclude>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/tests/rmdirr.lib.test_standalone.php b/tests/rmdirr.lib.test_standalone.php
deleted file mode 100755
index 88b766322e..0000000000
--- a/tests/rmdirr.lib.test_standalone.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-/**
- * A standalone test for testing the function rmdirr()
- * @author Ivan Tcholakov, September 2009.
- * @package chamilo.tests
- */
-/**
- * Init
- */
-//ini_set('memory_limit','128M');
-
-$_current_dir = dirname(__FILE__).'/';
-
-$_sys_code_path = $_current_dir.'../main/';
-$_sys_include_path = $_sys_code_path.'inc/';
-$_sys_library_path = $_sys_code_path.'inc/lib/';
-
-$_test_sys_code_path = $_current_dir.'main/';
-$_test_sys_include_path = $_test_sys_code_path.'inc/';
-$_test_sys_library_path = $_test_sys_code_path.'inc/lib/';
-
-
-require_once($_current_dir.'simpletest/unit_tester.php');
-require_once($_sys_include_path.'global.inc.php');
-
-//header('Content-Type: text/html; charset=' . $charset);
-header('Content-Type: text/html; charset=' . 'UTF-8');
-
-require_once($_current_dir.'simpletest/web_tester.php');
-require_once($_current_dir.'simpletest/mock_objects.php');
-require_once($_current_dir.'simpletest/autorun.php');
-
-$_SESSION['_user']['user_id'] = 1;
-
-class RmDirRTests extends TestSuite {
-
-    function  RmDirRTests() {
-        $this->TestSuite('Testing the function rmdirr()');
-
-        global $_test_sys_library_path;
-		$this->addTestFile($_test_sys_library_path.'rmdirr.lib.test.php');
-    }
-
-}
-
-$test = & new RmDirRTests();
-//$test-> run( new HtmlReporter());
-
-?>
diff --git a/tests/run.sh b/tests/run.sh
deleted file mode 100755
index e5eff08c1a..0000000000
--- a/tests/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-php5 test_suite.php > logs/results.xml
-xsltproc simpletest_to_junit.xsl logs/results.xml > logs/junit.xml
diff --git a/tests/scripts/packaging/README.md b/tests/scripts/packaging/README.md
deleted file mode 100644
index a7b328ab1b..0000000000
--- a/tests/scripts/packaging/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Git log script to pre-generate changelog
-========================================
-
-This directory only hosts a script to pre-generate the changelog for Chamilo.
-To work properly, it requires you to download Yannick Warnier's version of
-the php-git wrapper by the witty Sebastian Bergmann (author of PHP Unit, along
-other things): `git clone https://github.com/ywarnier/git php-git`.
-
-This should give you all you need to then launch 
-`php gitlog.php > /tmp/changelog` 
-and then copy-paste it to the Chamilo changelog (it still requires a careful
-manual review, but it already saves *a lot* of time).
diff --git a/tests/scripts/packaging/gitlog.php b/tests/scripts/packaging/gitlog.php
deleted file mode 100644
index 75ff5fbf67..0000000000
--- a/tests/scripts/packaging/gitlog.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * This script pre-generates a list of commits to generate a changelog in the
- * form (branch, then commits in HTML form, then a final feedback):
- *
- * @example
- * 1.9.x
- * <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/7333997ce358870bac139d15816dcaa7dd7794fa">7333997c</a> - <a href="https://task.beeznest.com/issues/8680">BT#8680</a>) Fixing custom lost password to work as classic Chamilo</li>
- * ...
- * <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/acdc14c47997315b151efda9a530c47a53100d68">acdc14c4</a> - <a href="https://task.beeznest.com/issues/8676">BT#8676</a>) Adding unique email validation option</li>
- * Printed 367 commits of 500 requested (others were minor)
- *
- * @author Yannick Warnier <yannick.warnier@beeznest.com>
- */
-/**
- * Includes a modified version of Git lib by Sebastian Bergmann of PHPUnit
- * @see https://github.com/ywarnier/git
- */
-require 'php-git/src/Git.php';
-$repository = __DIR__.'/../..';
-$number = 500; //the number of commits to check (including minor)
-$formatHTML = true;
-$showDate = false;
-$endCommit = false;
-if (!empty($argv[1])) {
-    if ($argv[1] == '-t') {
-        $showDate = true;
-    } else {
-        $endCommit = $argv[1];
-        echo "End commit has been defined as ".$endCommit.PHP_EOL;
-    }
-}
-
-$git = new \SebastianBergmann\Git\Git($repository);
-echo "Log from branch: ".$git->getCurrentBranch().PHP_EOL;
-
-$logs = $git->getRevisions('DESC', $number);
-$i = 0;
-foreach ($logs as $log) {
-    if ($showDate) {
-      echo $log['date']->format('Y-m-d H:i:s').' '.substr($log['sha1'],0,8).PHP_EOL;
-    }
-    // Check for Minor importance messages to ignore...
-    if (strncasecmp($log['message'], 'Minor', 5) === 0) {
-        //Skip minor messages
-        continue;
-    }
-    //Skip language update messages (not important)
-    $langMsg = array(
-        'Update language terms',
-        'Update language vars',
-        'Update lang vars',
-        'Merge',
-        'merge'
-    );
-    foreach ($langMsg as $msg) {
-        if (strpos($log['message'], $msg) === 0) {
-            continue 2;
-        }
-    }
-    // Look for tasks references
-    $issueLink = '';
-    $matches = array();
-    if (preg_match_all('/((BT)?#(\d){2,5})/', $log['message'], $matches)) {
-        $issue = $matches[0][0];
-        if (substr($issue, 0, 1) == '#') {
-            // not a BeezNest task
-            $num = substr($issue, 1);
-            if ($num > 4000) {
-                //should be Chamilo support site
-                if ($formatHTML) {
-                    $issueLink = ' - <a href="https://support.chamilo.org/issues/' . $num . '">CT#' . $num . '</a>';
-                } else {
-                    $issueLink = ' - ' . $num;
-                }
-            } else {
-                //should be Github
-                if ($formatHTML) {
-                    $issueLink = ' - <a href="https://github.com/chamilo/chamilo-lms/issues/' . $num . '">GH#' . $num . '</a>';
-                } else {
-                    $issueLink = ' - ' . $num;
-                }
-            }
-        } else {
-            $num = substr($issue, 3);
-            if ($num != '7683') {
-                if ($formatHTML) {
-                    //7683 is an internal task at BeezNest for all general contributions to Chamilo - no use in adding this reference
-                    $issueLink = ' - <a href="https://task.beeznest.com/issues/' . $num . '">BT#' . $num . '</a>';
-                } else {
-                    $issueLink = ' - ' . $num;
-                }
-            }
-        }
-        if ($hasRefs = stripos($log['message'], ' see '.$issue)) {
-            $log['message'] = substr($log['message'], 0, $hasRefs);
-        }
-        if ($hasRefs = stripos($log['message'], ' - ref')) {
-            $log['message'] = substr($log['message'], 0, $hasRefs);
-        }
-        if ($hasRefs = stripos($log['message'], ' -refs ')) {
-            $log['message'] = substr($log['message'], 0, $hasRefs);
-        }
-        
-    }
-    $commitLink = '';
-    if ($formatHTML) {
-        $log['message'] = ucfirst($log['message']);
-        $commitLink = '<a href="https://github.com/chamilo/chamilo-lms/commit/' . $log['sha1'] . '">' .
-            substr($log['sha1'], 0, 8) . '</a>';
-        echo '<li>('.$commitLink.$issueLink.') '.$log['message'].'</li>'.PHP_EOL;
-    } else {
-        $commitLink = substr($log['sha1'], 0, 8);
-        echo '('.$commitLink.$issueLink.') '.$log['message'].''.PHP_EOL;
-    }
-    // check end commit to stop processing
-    if ($endCommit) {
-        $length = strlen($endCommit);
-        if (substr($log['sha1'], 0, $length) == $endCommit) {
-            echo "Found the end commit ".$endCommit.", exiting...".PHP_EOL;
-            break;
-        }
-    }
-    $i++;
-}
-echo "Printed $i commits of $number requested (others were minor)".PHP_EOL;
diff --git a/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
deleted file mode 100755
index 8ac9cf2aa5..0000000000
--- a/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
+++ /dev/null
@@ -1,348 +0,0 @@
-Simple Test interface changes
-=============================
-Because the SimpleTest tool set is still evolving it is likely that tests
-written with earlier versions will fail with the newest ones. The most
-dramatic changes are in the alpha releases. Here is a list of possible
-problems and their fixes...
-
-No method getRelativeUrls() or getAbsoluteUrls()
-------------------------------------------------
-These methods were always a bit weird anyway, and
-the new parsing of the base tag makes them more so.
-They have been replaced with getUrls() instead. If
-you want the old functionality then simply chop
-off the current domain from getUrl().
-
-Method setWildcard() removed in mocks
--------------------------------------
-Even setWildcard() has been removed in 1.0.1beta now.
-If you want to test explicitely for a '*' string, then
-simply pass in new IdenticalExpectation('*') instead.
-
-No method _getTest() on mocks
------------------------------
-This has finally been removed. It was a pretty esoteric
-flex point anyway. It was there to allow the mocks to
-work with other test tools, but no one does this.
-
-No method assertError(), assertNoErrors(), swallowErrors()
-----------------------------------------------------------
-These have been deprecated in 1.0.1beta in favour of
-expectError() and expectException(). assertNoErrors() is
-redundant if you use expectError() as failures are now reported
-immediately.
-
-No method TestCase::signal()
-----------------------------
-This has been deprecated in favour of triggering an error or
-throwing an exception. Deprecated as of 1.0.1beta.
-
-No method TestCase::sendMessage()
----------------------------------
-This has been deprecated as of 1.0.1beta.
-
-Failure to connect now emits failures
--------------------------------------
-It used to be that you would have to use the
-getTransferError() call on the web tester to see if
-there was a socket level error in a fetch. This check
-is now always carried out by the WebTestCase unless
-the fetch is prefaced with WebTestCase::ignoreErrors().
-The ignore directive only lasts for test case fetching
-action such as get() and click().
-
-No method SimpleTestOptions::ignore()
--------------------------------------
-This is deprecated in version 1.0.1beta and has been moved
-to SimpleTest::ignore() as that is more readable. In
-addition, parent classes are also ignored automatically.
-If you are using PHP5 you can skip this directive simply
-by marking your test case as abstract.
-
-No method assertCopy()
-----------------------
-This is deprecated in 1.0.1 in favour of assertClone().
-The assertClone() method is slightly different in that
-the objects must be identical, but without being a
-reference. It is thus not a strict inversion of
-assertReference().
-
-Constructor wildcard override has no effect in mocks
-----------------------------------------------------
-As of 1.0.1beta this is now set with setWildcard() instead
-of in the constructor.
-
-No methods setStubBaseClass()/getStubBaseClass()
-------------------------------------------------
-As mocks are now used instead of stubs, these methods
-stopped working and are now removed as of the 1.0.1beta
-release. The mock objects may be freely used instead.
-
-No method addPartialMockCode()
-------------------------------
-The ability to insert arbitrary partial mock code
-has been removed. This was a low value feature
-causing needless complications. It was removed
-in the 1.0.1beta release.
-
-No method setMockBaseClass()
-----------------------------
-The ability to change the mock base class has been
-scheduled for removal and is deprecated since the
-1.0.1beta version. This was a rarely used feature
-except as a workaround for PHP5 limitations. As
-these limitations are being resolved it's hoped
-that the bundled mocks can be used directly.
-
-No class Stub
--------------
-Server stubs are deprecated from 1.0.1 as the mocks now
-have exactly the same interface. Just use mock objects
-instead.
-
-No class SimpleTestOptions
---------------------------
-This was replced by the shorter SimpleTest in 1.0.1beta1
-and is since deprecated.
-
-No file simple_test.php
------------------------
-This was renamed test_case.php in 1.0.1beta to more accurately
-reflect it's purpose. This file should never be directly
-included in test suites though, as it's part of the
-underlying mechanics and has a tendency to be refactored.
-
-No class WantedPatternExpectation
----------------------------------
-This was deprecated in 1.0.1alpha in favour of the simpler
-name PatternExpectation.
-
-No class NoUnwantedPatternExpectation
--------------------------------------
-This was deprecated in 1.0.1alpha in favour of the simpler
-name NoPatternExpectation.
-
-No method assertNoUnwantedPattern()
------------------------------------
-This has been renamed to assertNoPattern() in 1.0.1alpha and
-the old form is deprecated.
-
-No method assertWantedPattern()
--------------------------------
-This has been renamed to assertPattern() in 1.0.1alpha and
-the old form is deprecated.
-
-No method assertExpectation()
------------------------------
-This was renamed as assert() in 1.0.1alpha and the old form
-has been deprecated.
-
-No class WildcardExpectation
-----------------------------
-This was a mostly internal class for the mock objects. It was
-renamed AnythingExpectation to bring it closer to JMock and
-NMock in version 1.0.1alpha.
-
-Missing UnitTestCase::assertErrorPattern()
-------------------------------------------
-This method is deprecated for version 1.0.1 onwards.
-This method has been subsumed by assertError() that can now
-take an expectation. Simply pass a PatternExpectation
-into assertError() to simulate the old behaviour.
-
-No HTML when matching page elements
------------------------------------
-This behaviour has been switched to using plain text as if it
-were seen by the user of the browser. This means that HTML tags
-are suppressed, entities are converted and whitespace is
-normalised. This should make it easier to match items in forms.
-Also images are replaced with their "alt" text so that they
-can be matched as well.
-
-No method SimpleRunner::_getTestCase()
---------------------------------------
-This was made public as getTestCase() in 1.0RC2.
-
-No method restartSession()
---------------------------
-This was renamed to restart() in the WebTestCase, SimpleBrowser
-and the underlying SimpleUserAgent in 1.0RC2. Because it was
-undocumented anyway, no attempt was made at backward
-compatibility.
-
-My custom test case ignored by tally()
---------------------------------------
-The _assertTrue method has had it's signature changed due to a bug
-in the PHP 5.0.1 release. You must now use getTest() from within
-that method to get the test case. Mock compatibility with other
-unit testers is now deprecated as of 1.0.1alpha as PEAR::PHPUnit2
-should soon have mock support of it's own.
-
-Broken code extending SimpleRunner
-----------------------------------
-This was replaced with SimpleScorer so that I could use the runner
-name in another class. This happened in RC1 development and there
-is no easy backward compatibility fix. The solution is simply to
-extend SimpleScorer instead.
-
-Missing method getBaseCookieValue()
------------------------------------
-This was renamed getCurrentCookieValue() in RC1.
-
-Missing files from the SimpleTest suite
----------------------------------------
-Versions of SimpleTest prior to Beta6 required a SIMPLE_TEST constant
-to point at the SimpleTest folder location before any of the toolset
-was loaded. This is no longer documented as it is now unnecessary
-for later versions. If you are using an earlier version you may
-need this constant. Consult the documentation that was bundled with
-the release that you are using or upgrade to Beta6 or later.
-
-No method SimpleBrowser::getCurrentUrl()
---------------------------------------
-This is replaced with the more versatile showRequest() for
-debugging. It only existed in this context for version Beta5.
-Later versions will have SimpleBrowser::getHistory() for tracking
-paths through pages. It is renamed as getUrl() since 1.0RC1.
-
-No method Stub::setStubBaseClass()
-----------------------------------
-This method has finally been removed in 1.0RC1. Use
-SimpleTestOptions::setStubBaseClass() instead.
-
-No class CommandLineReporter
-----------------------------
-This was renamed to TextReporter in Beta3 and the deprecated version
-was removed in 1.0RC1.
-
-No method requireReturn()
--------------------------
-This was deprecated in Beta3 and is now removed.
-
-No method expectCookie()
-------------------------
-This method was abruptly removed in Beta4 so as to simplify the internals
-until another mechanism can replace it. As a workaround it is necessary
-to assert that the cookie has changed by setting it before the page
-fetch and then assert the desired value.
-
-No method clickSubmitByFormId()
--------------------------------
-This method had an incorrect name as no button was involved. It was
-renamed to submitByFormId() in Beta4 and the old version deprecated.
-Now removed.
-
-No method paintStart() or paintEnd()
-------------------------------------
-You should only get this error if you have subclassed the lower level
-reporting and test runner machinery. These methods have been broken
-down into events for test methods, events for test cases and events
-for group tests. The new methods are...
-
-paintStart() --> paintMethodStart(), paintCaseStart(), paintGroupStart()
-paintEnd() --> paintMethodEnd(), paintCaseEnd(), paintGroupEnd()
-
-This change was made in Beta3, ironically to make it easier to subclass
-the inner machinery. Simply duplicating the code you had in the previous
-methods should provide a temporary fix.
-
-No class TestDisplay
---------------------
-This has been folded into SimpleReporter in Beta3 and is now deprecated.
-It was removed in RC1.
-
-No method WebTestCase::fetch()
-------------------------------
-This was renamed get() in Alpha8. It is removed in Beta3.
-
-No method submit()
-------------------
-This has been renamed clickSubmit() in Beta1. The old method was
-removed in Beta2.
-
-No method clearHistory()
-------------------------
-This method is deprecated in Beta2 and removed in RC1.
-
-No method getCallCount()
-------------------------
-This method has been deprecated since Beta1 and has now been
-removed. There are now more ways to set expectations on counts
-and so this method should be unecessery. Removed in RC1.
-
-Cannot find file *
-------------------
-The following public name changes have occoured...
-
-simple_html_test.php --> reporter.php
-simple_mock.php --> mock_objects.php
-simple_unit.php --> unit_tester.php
-simple_web.php --> web_tester.php
-
-The old names were deprecated in Alpha8 and removed in Beta1.
-
-No method attachObserver()
---------------------------
-Prior to the Alpha8 release the old internal observer pattern was
-gutted and replaced with a visitor. This is to trade flexibility of
-test case expansion against the ease of writing user interfaces.
-
-Code such as...
-
-$test = &new MyTestCase();
-$test->attachObserver(new TestHtmlDisplay());
-$test->run();
-
-...should be rewritten as...
-
-$test = &new MyTestCase();
-$test->run(new HtmlReporter());
-
-If you previously attached multiple observers then the workaround
-is to run the tests twice, once with each, until they can be combined.
-For one observer the old method is simulated in Alpha 8, but is
-removed in Beta1.
-
-No class TestHtmlDisplay
-------------------------
-This class has been renamed to HtmlReporter in Alpha8. It is supported,
-but deprecated in Beta1 and removed in Beta2. If you have subclassed
-the display for your own design, then you will have to extend this
-class (HtmlReporter) instead.
-
-If you have accessed the event queue by overriding the notify() method
-then I am afraid you are in big trouble :(. The reporter is now
-carried around the test suite by the runner classes and the methods
-called directly. In the unlikely event that this is a problem and
-you don't want to upgrade the test tool then simplest is to write your
-own runner class and invoke the tests with...
-
-$test->accept(new MyRunner(new MyReporter()));
-
-...rather than the run method. This should be easier to extend
-anyway and gives much more control. Even this method is overhauled
-in Beta3 where the runner class can be set within the test case. Really
-the best thing to do is to upgrade to this version as whatever you were
-trying to achieve before should now be very much easier.
-
-Missing set options method
---------------------------
-All test suite options are now in one class called SimpleTestOptions.
-This means that options are set differently...
-
-GroupTest::ignore() --> SimpleTestOptions::ignore()
-Mock::setMockBaseClass() --> SimpleTestOptions::setMockBaseClass()
-
-These changed in Alpha8 and the old versions are now removed in RC1.
-
-No method setExpected*()
-------------------------
-The mock expectations changed their names in Alpha4 and the old names
-ceased to be supported in Alpha8. The changes are...
-
-setExpectedArguments() --> expectArguments()
-setExpectedArgumentsSequence() --> expectArgumentsAt()
-setExpectedCallCount() --> expectCallCount()
-setMaximumCallCount() --> expectMaximumCallCount()
-
-The parameters remained the same.
diff --git a/tests/simpletest/LICENSE b/tests/simpletest/LICENSE
deleted file mode 100755
index 09f465ab70..0000000000
--- a/tests/simpletest/LICENSE
+++ /dev/null
@@ -1,502 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/tests/simpletest/README b/tests/simpletest/README
deleted file mode 100755
index c52e3f7edc..0000000000
--- a/tests/simpletest/README
+++ /dev/null
@@ -1,108 +0,0 @@
-SimpleTest
-==========
-You probably got this package from...
-http://simpletest.sourceforge.net/projects/simpletest/
-
-If there is no licence agreement with this package please download
-a version from the location above. You must read and accept that
-licence to use this software. The file is titled simply LICENSE.
-
-What is it? It's a framework for unit testing, web site testing and
-mock objects for PHP 4.2.0+ (and PHP 5.0 to 5.3 without E_STRICT).
-
-If you have used JUnit, you will find this PHP unit testing version very
-similar. Also included is a mock objects and server stubs generator.
-The stubs can have return values set for different arguments, can have
-sequences set also by arguments and can return items by reference.
-The mocks inherit all of this functionality and can also have
-expectations set, again in sequences and for different arguments.
-
-A web tester similar in concept to JWebUnit is also included. There is no
-JavaScript or tables support, but forms, authentication, cookies and
-frames are handled.
-
-You can see a release schedule at http://www.lastcraft.com/overview.php
-which is also copied to the documentation folder with this release.
-A full PHPDocumenter API documentation exists at
-http://simpletest.sourceforge.net/.
-
-The user interface is minimal
-in the extreme, but a lot of information flows from the test suite.
-After version 1.0 we will release a better web UI, but we are leaving XUL
-and GTk versions to volunteers as everybody has their own opinion
-on a good GUI, and we don't want to discourage development by shipping
-one with the toolkit. YOucan download an Eclipse plug-in separately.
-
-You are looking at a second full release. The unit tests for SimpleTest
-itself can be run here...
-
-simpletest/test/unit_tests.php
-
-And tests involving live network connections as well are here...
-
-simpletest/test/all_tests.php
-
-The full tests will typically overrun the 8Mb limit often allowed
-to a PHP process. A workaround is to run the tests on the command
-with a custom php.ini file if you do not have access to your server
-version.
-
-You will have to edit the all_tests.php file if you are accesssing
-the internet through a proxy server. See the comments in all_tests.php
-for instructions.
-
-The full tests read some test data from the LastCraft site. If the site
-is down or has been modified for a later version then you will get
-spurious errors. A unit_tests.php failure on the other hand would be
-very serious. As far as we know we haven't yet managed to check in any
-unit test failures, so please correct us if you find one.
-
-Even if all of the tests run please verify that your existing test suites
-also function as expected. If they don't see the file...
-
-HELP_MY_TESTS_DONT_WORK_ANYMORE
-
-This contains information on interface changes. It also points out
-deprecated interfaces, so you should read this even if all of
-your current tests appear to run.
-
-There is a documentation folder which contains the core reference information
-in English and French, although this information is fairly basic.
-You can find a tutorial on...
-
-http://www.lastcraft.com/first_test_tutorial.php
-
-...to get you started and this material will eventually become included
-with the project documentation. A French translation exists at...
-
-http://www.onpk.net/index.php/2005/01/12/254-tutoriel-simpletest-decouvrir-les-tests-unitaires.
-
-If you download and use, and possibly even extend this tool, please let us
-know. Any feedback, even bad, is always welcome and we will work to get
-your suggestions into the next release. Ideally please send your
-comments to...
-
-simpletest-support@lists.sourceforge.net
-
-...so that others can read them too. We usually try to respond within 48
-hours.
-
-There is no change log except at Sourceforge. You can visit the
-release notes to see the completed TODO list after each cycle and also the
-status of any bugs, but if the bug is recent then it will be fixed in SVN only.
-The SVN check-ins always have all the tests passing and so SVN snapshots should
-be pretty usable, although the code may not look so good internally.
-
-Oh, yes. It is called "Simple" because it should be simple to
-use. We intend to add a complete set of tools for a test first
-and "test as you code" type of development. "Simple" does not
-mean "Lite" in this context.
-
-Thanks to everyone who has sent comments and offered suggestions. They
-really are invaluable, but sadly you are too many to mention in full.
-Thanks to all on the advanced PHP forum on SitePoint, especially Harry
-Feucks. Early adopters are always an inspiration.
-
-Marcus Baker, Jason Sweat, Travis Swicegood, Perrick Penet and Edward Z. Yang.
--- 
-marcus@lastcraft.com
diff --git a/tests/simpletest/VERSION b/tests/simpletest/VERSION
deleted file mode 100755
index 7f207341d5..0000000000
--- a/tests/simpletest/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0.1
\ No newline at end of file
diff --git a/tests/simpletest/authentication.php b/tests/simpletest/authentication.php
deleted file mode 100755
index 067e629bcc..0000000000
--- a/tests/simpletest/authentication.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: authentication.php 1720 2008-04-07 02:32:43Z lastcraft $
- */
-/**
- *  include http class
- */
-require_once(dirname(__FILE__) . '/http.php');
-
-/**
- *    Represents a single security realm's identity.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRealm {
-    var $_type;
-    var $_root;
-    var $_username;
-    var $_password;
-
-    /**
-     *    Starts with the initial entry directory.
-     *    @param string $type      Authentication type for this
-     *                             realm. Only Basic authentication
-     *                             is currently supported.
-     *    @param SimpleUrl $url    Somewhere in realm.
-     *    @access public
-     */
-    function SimpleRealm($type, $url) {
-        $this->_type = $type;
-        $this->_root = $url->getBasePath();
-        $this->_username = false;
-        $this->_password = false;
-    }
-
-    /**
-     *    Adds another location to the realm.
-     *    @param SimpleUrl $url    Somewhere in realm.
-     *    @access public
-     */
-    function stretch($url) {
-        $this->_root = $this->_getCommonPath($this->_root, $url->getPath());
-    }
-
-    /**
-     *    Finds the common starting path.
-     *    @param string $first        Path to compare.
-     *    @param string $second       Path to compare.
-     *    @return string              Common directories.
-     *    @access private
-     */
-    function _getCommonPath($first, $second) {
-        $first = explode('/', $first);
-        $second = explode('/', $second);
-        for ($i = 0; $i < min(count($first), count($second)); $i++) {
-            if ($first[$i] != $second[$i]) {
-                return implode('/', array_slice($first, 0, $i)) . '/';
-            }
-        }
-        return implode('/', $first) . '/';
-    }
-
-    /**
-     *    Sets the identity to try within this realm.
-     *    @param string $username    Username in authentication dialog.
-     *    @param string $username    Password in authentication dialog.
-     *    @access public
-     */
-    function setIdentity($username, $password) {
-        $this->_username = $username;
-        $this->_password = $password;
-    }
-
-    /**
-     *    Accessor for current identity.
-     *    @return string        Last succesful username.
-     *    @access public
-     */
-    function getUsername() {
-        return $this->_username;
-    }
-
-    /**
-     *    Accessor for current identity.
-     *    @return string        Last succesful password.
-     *    @access public
-     */
-    function getPassword() {
-        return $this->_password;
-    }
-
-    /**
-     *    Test to see if the URL is within the directory
-     *    tree of the realm.
-     *    @param SimpleUrl $url    URL to test.
-     *    @return boolean          True if subpath.
-     *    @access public
-     */
-    function isWithin($url) {
-        if ($this->_isIn($this->_root, $url->getBasePath())) {
-            return true;
-        }
-        if ($this->_isIn($this->_root, $url->getBasePath() . $url->getPage() . '/')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Tests to see if one string is a substring of
-     *    another.
-     *    @param string $part        Small bit.
-     *    @param string $whole       Big bit.
-     *    @return boolean            True if the small bit is
-     *                               in the big bit.
-     *    @access private
-     */
-    function _isIn($part, $whole) {
-        return strpos($whole, $part) === 0;
-    }
-}
-
-/**
- *    Manages security realms.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAuthenticator {
-    var $_realms;
-
-    /**
-     *    Clears the realms.
-     *    @access public
-     */
-    function SimpleAuthenticator() {
-        $this->restartSession();
-    }
-
-    /**
-     *    Starts with no realms set up.
-     *    @access public
-     */
-    function restartSession() {
-        $this->_realms = array();
-    }
-
-    /**
-     *    Adds a new realm centered the current URL.
-     *    Browsers vary wildly on their behaviour in this
-     *    regard. Mozilla ignores the realm and presents
-     *    only when challenged, wasting bandwidth. IE
-     *    just carries on presenting until a new challenge
-     *    occours. SimpleTest tries to follow the spirit of
-     *    the original standards committee and treats the
-     *    base URL as the root of a file tree shaped realm.
-     *    @param SimpleUrl $url    Base of realm.
-     *    @param string $type      Authentication type for this
-     *                             realm. Only Basic authentication
-     *                             is currently supported.
-     *    @param string $realm     Name of realm.
-     *    @access public
-     */
-    function addRealm($url, $type, $realm) {
-        $this->_realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
-    }
-
-    /**
-     *    Sets the current identity to be presented
-     *    against that realm.
-     *    @param string $host        Server hosting realm.
-     *    @param string $realm       Name of realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @access public
-     */
-    function setIdentityForRealm($host, $realm, $username, $password) {
-        if (isset($this->_realms[$host][$realm])) {
-            $this->_realms[$host][$realm]->setIdentity($username, $password);
-        }
-    }
-
-    /**
-     *    Finds the name of the realm by comparing URLs.
-     *    @param SimpleUrl $url        URL to test.
-     *    @return SimpleRealm          Name of realm.
-     *    @access private
-     */
-    function _findRealmFromUrl($url) {
-        if (! isset($this->_realms[$url->getHost()])) {
-            return false;
-        }
-        foreach ($this->_realms[$url->getHost()] as $name => $realm) {
-            if ($realm->isWithin($url)) {
-                return $realm;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Presents the appropriate headers for this location.
-     *    @param SimpleHttpRequest $request  Request to modify.
-     *    @param SimpleUrl $url              Base of realm.
-     *    @access public
-     */
-    function addHeaders(&$request, $url) {
-        if ($url->getUsername() && $url->getPassword()) {
-            $username = $url->getUsername();
-            $password = $url->getPassword();
-        } elseif ($realm = $this->_findRealmFromUrl($url)) {
-            $username = $realm->getUsername();
-            $password = $realm->getPassword();
-        } else {
-            return;
-        }
-        $this->addBasicHeaders($request, $username, $password);
-    }
-
-    /**
-     *    Presents the appropriate headers for this
-     *    location for basic authentication.
-     *    @param SimpleHttpRequest $request  Request to modify.
-     *    @param string $username            Username for realm.
-     *    @param string $password            Password for realm.
-     *    @access public
-     *    @static
-     */
-    function addBasicHeaders(&$request, $username, $password) {
-        if ($username && $password) {
-            $request->addHeaderLine(
-                    'Authorization: Basic ' . base64_encode("$username:$password"));
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/autorun.php b/tests/simpletest/autorun.php
deleted file mode 100755
index 7d97d2d7f2..0000000000
--- a/tests/simpletest/autorun.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- *  Autorunner which runs all tests cases found in a file
- *  that includes this module.
- *  @package    SimpleTest
- *  @version    $Id: autorun.php 1721 2008-04-07 19:27:10Z lastcraft $
- */
-require_once dirname(__FILE__) . '/unit_tester.php';
-require_once dirname(__FILE__) . '/mock_objects.php';
-require_once dirname(__FILE__) . '/collector.php';
-require_once dirname(__FILE__) . '/default_reporter.php';
-
-$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_CLASSES'] = get_declared_classes();
-register_shutdown_function('simpletest_autorun');
-
-/**
- *    Exit handler to run all recent test cases if no test has
- *    so far been run. Uses the DefaultReporter which can have
- *    it's output controlled with SimpleTest::prefer().
- */
-function simpletest_autorun() {
-    if (tests_have_run()) {
-        return;
-    }
-    $candidates = array_intersect(
-            capture_new_classes(),
-            classes_defined_in_initial_file());
-    $loader = new SimpleFileLoader();
-    $suite = $loader->createSuiteFromClasses(
-            basename(initial_file()),
-            $loader->selectRunnableTests($candidates));
-    $result = $suite->run(new DefaultReporter());
-    if (SimpleReporter::inCli()) {
-        exit($result ? 0 : 1);
-    }
-}
-
-/**
- *    Checks the current test context to see if a test has
- *    ever been run.
- *    @return boolean        True if tests have run.
- */
-function tests_have_run() {
-    if ($context = SimpleTest::getContext()) {
-        return (boolean)$context->getTest();
-    }
-    return false;
-}
-
-/**
- *    The first autorun file.
- *    @return string        Filename of first autorun script.
- */
-function initial_file() {
-    static $file = false;
-    if (! $file) {
-        $file = reset(get_included_files());
-    }
-    return $file;
-}
-
-/**
- *    Just the classes from the first autorun script. May
- *    get a few false positives, as it just does a regex based
- *    on following the word "class".
- *    @return array        List of all possible classes in first
- *                         autorun script.
- */
-function classes_defined_in_initial_file() {
-    if (preg_match_all('/\bclass\s+(\w+)/i', file_get_contents(initial_file()), $matches)) {
-        return array_map('strtolower', $matches[1]);
-    }
-    return array();
-}
-
-/**
- *    Every class since the first autorun include. This
- *    is safe enough if require_once() is alwyas used.
- *    @return array        Class names.
- */
-function capture_new_classes() {
-    global $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES;
-    return array_map('strtolower', array_diff(get_declared_classes(),
-                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
-                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/browser.php b/tests/simpletest/browser.php
deleted file mode 100755
index d1dc13ffb6..0000000000
--- a/tests/simpletest/browser.php
+++ /dev/null
@@ -1,1098 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: browser.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/selector.php');
-require_once(dirname(__FILE__) . '/frames.php');
-require_once(dirname(__FILE__) . '/user_agent.php');
-/**#@-*/
-
-if (!defined('DEFAULT_MAX_NESTED_FRAMES')) {
-    define('DEFAULT_MAX_NESTED_FRAMES', 3);
-}
-
-/**
- *    Browser history list.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBrowserHistory {
-    var $_sequence;
-    var $_position;
-
-    /**
-     *    Starts empty.
-     *    @access public
-     */
-    function SimpleBrowserHistory() {
-        $this->_sequence = array();
-        $this->_position = -1;
-    }
-
-    /**
-     *    Test for no entries yet.
-     *    @return boolean        True if empty.
-     *    @access private
-     */
-    function _isEmpty() {
-        return ($this->_position == -1);
-    }
-
-    /**
-     *    Test for being at the beginning.
-     *    @return boolean        True if first.
-     *    @access private
-     */
-    function _atBeginning() {
-        return ($this->_position == 0) && ! $this->_isEmpty();
-    }
-
-    /**
-     *    Test for being at the last entry.
-     *    @return boolean        True if last.
-     *    @access private
-     */
-    function _atEnd() {
-        return ($this->_position + 1 >= count($this->_sequence)) && ! $this->_isEmpty();
-    }
-
-    /**
-     *    Adds a successfully fetched page to the history.
-     *    @param SimpleUrl $url                 URL of fetch.
-     *    @param SimpleEncoding $parameters     Any post data with the fetch.
-     *    @access public
-     */
-    function recordEntry($url, $parameters) {
-        $this->_dropFuture();
-        array_push(
-                $this->_sequence,
-                array('url' => $url, 'parameters' => $parameters));
-        $this->_position++;
-    }
-
-    /**
-     *    Last fully qualified URL for current history
-     *    position.
-     *    @return SimpleUrl        URL for this position.
-     *    @access public
-     */
-    function getUrl() {
-        if ($this->_isEmpty()) {
-            return false;
-        }
-        return $this->_sequence[$this->_position]['url'];
-    }
-
-    /**
-     *    Parameters of last fetch from current history
-     *    position.
-     *    @return SimpleFormEncoding    Post parameters.
-     *    @access public
-     */
-    function getParameters() {
-        if ($this->_isEmpty()) {
-            return false;
-        }
-        return $this->_sequence[$this->_position]['parameters'];
-    }
-
-    /**
-     *    Step back one place in the history. Stops at
-     *    the first page.
-     *    @return boolean     True if any previous entries.
-     *    @access public
-     */
-    function back() {
-        if ($this->_isEmpty() || $this->_atBeginning()) {
-            return false;
-        }
-        $this->_position--;
-        return true;
-    }
-
-    /**
-     *    Step forward one place. If already at the
-     *    latest entry then nothing will happen.
-     *    @return boolean     True if any future entries.
-     *    @access public
-     */
-    function forward() {
-        if ($this->_isEmpty() || $this->_atEnd()) {
-            return false;
-        }
-        $this->_position++;
-        return true;
-    }
-
-    /**
-     *    Ditches all future entries beyond the current
-     *    point.
-     *    @access private
-     */
-    function _dropFuture() {
-        if ($this->_isEmpty()) {
-            return;
-        }
-        while (! $this->_atEnd()) {
-            array_pop($this->_sequence);
-        }
-    }
-}
-
-/**
- *    Simulated web browser. This is an aggregate of
- *    the user agent, the HTML parsing, request history
- *    and the last header set.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBrowser {
-    var $_user_agent;
-    var $_page;
-    var $_history;
-    var $_ignore_frames;
-    var $_maximum_nested_frames;
-
-    /**
-     *    Starts with a fresh browser with no
-     *    cookie or any other state information. The
-     *    exception is that a default proxy will be
-     *    set up if specified in the options.
-     *    @access public
-     */
-    function SimpleBrowser() {
-        $this->_user_agent = &$this->_createUserAgent();
-        $this->_user_agent->useProxy(
-                SimpleTest::getDefaultProxy(),
-                SimpleTest::getDefaultProxyUsername(),
-                SimpleTest::getDefaultProxyPassword());
-        $this->_page = &new SimplePage();
-        $this->_history = &$this->_createHistory();
-        $this->_ignore_frames = false;
-        $this->_maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
-    }
-
-    /**
-     *    Creates the underlying user agent.
-     *    @return SimpleFetcher    Content fetcher.
-     *    @access protected
-     */
-    function &_createUserAgent() {
-        $user_agent = &new SimpleUserAgent();
-        return $user_agent;
-    }
-
-    /**
-     *    Creates a new empty history list.
-     *    @return SimpleBrowserHistory    New list.
-     *    @access protected
-     */
-    function &_createHistory() {
-        $history = &new SimpleBrowserHistory();
-        return $history;
-    }
-
-    /**
-     *    Disables frames support. Frames will not be fetched
-     *    and the frameset page will be used instead.
-     *    @access public
-     */
-    function ignoreFrames() {
-        $this->_ignore_frames = true;
-    }
-
-    /**
-     *    Enables frames support. Frames will be fetched from
-     *    now on.
-     *    @access public
-     */
-    function useFrames() {
-        $this->_ignore_frames = false;
-    }
-
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->_user_agent->ignoreCookies();
-    }
-
-    /**
-     *    Switches back on the cookie sending and recieving.
-     *    @access public
-     */
-    function useCookies() {
-        $this->_user_agent->useCookies();
-    }
-
-    /**
-     *    Parses the raw content into a page. Will load further
-     *    frame pages unless frames are disabled.
-     *    @param SimpleHttpResponse $response    Response from fetch.
-     *    @param integer $depth                  Nested frameset depth.
-     *    @return SimplePage                     Parsed HTML.
-     *    @access private
-     */
-    function &_parse($response, $depth = 0) {
-        $page = &$this->_buildPage($response);
-        if ($this->_ignore_frames || ! $page->hasFrames() || ($depth > $this->_maximum_nested_frames)) {
-            return $page;
-        }
-        $frameset = &new SimpleFrameset($page);
-        foreach ($page->getFrameset() as $key => $url) {
-            $frame = &$this->_fetch($url, new SimpleGetEncoding(), $depth + 1);
-            $frameset->addFrame($frame, $key);
-        }
-        return $frameset;
-    }
-
-    /**
-     *    Assembles the parsing machinery and actually parses
-     *    a single page. Frees all of the builder memory and so
-     *    unjams the PHP memory management.
-     *    @param SimpleHttpResponse $response    Response from fetch.
-     *    @return SimplePage                     Parsed top level page.
-     *    @access protected
-     */
-    function &_buildPage($response) {
-        $builder = &new SimplePageBuilder();
-        $page = &$builder->parse($response);
-        $builder->free();
-        unset($builder);
-        return $page;
-    }
-
-    /**
-     *    Fetches a page. Jointly recursive with the _parse()
-     *    method as it descends a frameset.
-     *    @param string/SimpleUrl $url          Target to fetch.
-     *    @param SimpleEncoding $encoding       GET/POST parameters.
-     *    @param integer $depth                 Nested frameset depth protection.
-     *    @return SimplePage                    Parsed page.
-     *    @access private
-     */
-    function &_fetch($url, $encoding, $depth = 0) {
-        $response = &$this->_user_agent->fetchResponse($url, $encoding);
-        if ($response->isError()) {
-            $page = &new SimplePage($response);
-        } else {
-            $page = &$this->_parse($response, $depth);
-        }
-        return $page;
-    }
-
-    /**
-     *    Fetches a page or a single frame if that is the current
-     *    focus.
-     *    @param SimpleUrl $url                   Target to fetch.
-     *    @param SimpleEncoding $parameters       GET/POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    function _load($url, $parameters) {
-        $frame = $url->getTarget();
-        if (! $frame || ! $this->_page->hasFrames() || (strtolower($frame) == '_top')) {
-            return $this->_loadPage($url, $parameters);
-        }
-        return $this->_loadFrame(array($frame), $url, $parameters);
-    }
-
-    /**
-     *    Fetches a page and makes it the current page/frame.
-     *    @param string/SimpleUrl $url            Target to fetch as string.
-     *    @param SimplePostEncoding $parameters   POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    function _loadPage($url, $parameters) {
-        $this->_page = &$this->_fetch($url, $parameters);
-        $this->_history->recordEntry(
-                $this->_page->getUrl(),
-                $this->_page->getRequestData());
-        return $this->_page->getRaw();
-    }
-
-    /**
-     *    Fetches a frame into the existing frameset replacing the
-     *    original.
-     *    @param array $frames                    List of names to drill down.
-     *    @param string/SimpleUrl $url            Target to fetch as string.
-     *    @param SimpleFormEncoding $parameters   POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    function _loadFrame($frames, $url, $parameters) {
-        $page = &$this->_fetch($url, $parameters);
-        $this->_page->setFrame($frames, $page);
-        return $page->getRaw();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened.
-     *    @param string/integer $date   Time when session restarted.
-     *                                  If omitted then all persistent
-     *                                  cookies are kept.
-     *    @access public
-     */
-    function restart($date = false) {
-        $this->_user_agent->restart($date);
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->_user_agent->addHeader($header);
-    }
-
-    /**
-     *    Ages the cookies by the specified time.
-     *    @param integer $interval    Amount in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->_user_agent->ageCookies($interval);
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name       Cookie key.
-     *    @param string $value      Value of cookie.
-     *    @param string $host       Host upon which the cookie is valid.
-     *    @param string $path       Cookie path if not host wide.
-     *    @param string $expiry     Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->_user_agent->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        return $this->_user_agent->getCookieValue($host, $path, $name);
-    }
-
-    /**
-     *    Reads the current cookies for the current URL.
-     *    @param string $name   Key of cookie to find.
-     *    @return string        Null if there is no current URL, false
-     *                          if the cookie is not set.
-     *    @access public
-     */
-    function getCurrentCookieValue($name) {
-        return $this->_user_agent->getBaseCookieValue($name, $this->_page->getUrl());
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    a page will be loaded anyway.
-     *    @param integer $max        Most hops allowed.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        $this->_user_agent->setMaximumRedirects($max);
-    }
-
-    /**
-     *    Sets the maximum number of nesting of framed pages
-     *    within a framed page to prevent loops.
-     *    @param integer $max        Highest depth allowed.
-     *    @access public
-     */
-    function setMaximumNestedFrames($max) {
-        $this->_maximum_nested_frames = $max;
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->_user_agent->setConnectionTimeout($timeout);
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $this->_user_agent->useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    Fetches the page content with a HEAD request.
-     *    Will affect cookies, but will not change the base URL.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
-     *                                                HEAD request.
-     *    @return boolean                             True if successful.
-     *    @access public
-     */
-    function head($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        $response = &$this->_user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
-        return ! $response->isError();
-    }
-
-    /**
-     *    Fetches the page content with a simple GET request.
-     *    @param string/SimpleUrl $url                Target to fetch.
-     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
-     *                                                GET request.
-     *    @return string                              Content of page or false.
-     *    @access public
-     */
-    function get($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->_load($url, new SimpleGetEncoding($parameters));
-    }
-
-    /**
-     *    Fetches the page content with a POST request.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleFormEncoding $parameters  POST parameters.
-     *    @return string                              Content of page.
-     *    @access public
-     */
-    function post($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->_load($url, new SimplePostEncoding($parameters));
-    }
-
-    /**
-     *    Equivalent to hitting the retry button on the
-     *    browser. Will attempt to repeat the page fetch. If
-     *    there is no history to repeat it will give false.
-     *    @return string/boolean   Content if fetch succeeded
-     *                             else false.
-     *    @access public
-     */
-    function retry() {
-        $frames = $this->_page->getFrameFocus();
-        if (count($frames) > 0) {
-            $this->_loadFrame(
-                    $frames,
-                    $this->_page->getUrl(),
-                    $this->_page->getRequestData());
-            return $this->_page->getRaw();
-        }
-        if ($url = $this->_history->getUrl()) {
-            $this->_page = &$this->_fetch($url, $this->_history->getParameters());
-            return $this->_page->getRaw();
-        }
-        return false;
-    }
-
-    /**
-     *    Equivalent to hitting the back button on the
-     *    browser. The browser history is unchanged on
-     *    failure. The page content is refetched as there
-     *    is no concept of content caching in SimpleTest.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded
-     *    @access public
-     */
-    function back() {
-        if (! $this->_history->back()) {
-            return false;
-        }
-        $content = $this->retry();
-        if (! $content) {
-            $this->_history->forward();
-        }
-        return $content;
-    }
-
-    /**
-     *    Equivalent to hitting the forward button on the
-     *    browser. The browser history is unchanged on
-     *    failure. The page content is refetched as there
-     *    is no concept of content caching in SimpleTest.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded
-     *    @access public
-     */
-    function forward() {
-        if (! $this->_history->forward()) {
-            return false;
-        }
-        $content = $this->retry();
-        if (! $content) {
-            $this->_history->back();
-        }
-        return $content;
-    }
-
-    /**
-     *    Retries a request after setting the authentication
-     *    for the current realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @return boolean            True if successful fetch. Note
-     *                               that authentication may still have
-     *                               failed.
-     *    @access public
-     */
-    function authenticate($username, $password) {
-        if (! $this->_page->getRealm()) {
-            return false;
-        }
-        $url = $this->_page->getUrl();
-        if (! $url) {
-            return false;
-        }
-        $this->_user_agent->setIdentity(
-                $url->getHost(),
-                $this->_page->getRealm(),
-                $username,
-                $password);
-        return $this->retry();
-    }
-
-    /**
-     *    Accessor for a breakdown of the frameset.
-     *    @return array   Hash tree of frames by name
-     *                    or index if no name.
-     *    @access public
-     */
-    function getFrames() {
-        return $this->_page->getFrames();
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus.
-     *    @return integer/string/boolean    Label if any, otherwise
-     *                                      the position in the frameset
-     *                                      or false if none.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return $this->_page->getFrameFocus();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return $this->_page->setFrameFocusByIndex($choice);
-    }
-
-    /**
-     *    Sets the focus by name.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return $this->_page->setFrameFocus($name);
-    }
-
-    /**
-     *    Clears the frame focus. All frames will be searched
-     *    for content.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        return $this->_page->clearFrameFocus();
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->_page->getTransportError();
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        return $this->_page->getMimeType();
-    }
-
-    /**
-     *    Accessor for last response code.
-     *    @return integer    Last HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        return $this->_page->getResponseCode();
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        return $this->_page->getAuthentication();
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        return $this->_page->getRealm();
-    }
-
-    /**
-     *    Accessor for current URL of page or frame if
-     *    focused.
-     *    @return string    Location of current page or frame as
-     *                      a string.
-     */
-    function getUrl() {
-        $url = $this->_page->getUrl();
-        return $url ? $url->asString() : false;
-    }
-
-    /**
-     *    Accessor for base URL of page if set via BASE tag
-     *    @return string    base URL
-     */
-    function getBaseUrl() {
-        $url = $this->_page->getBaseUrl();
-        return $url ? $url->asString() : false;
-    }
-
-    /**
-     *    Accessor for raw bytes sent down the wire.
-     *    @return string      Original text sent.
-     *    @access public
-     */
-    function getRequest() {
-        return $this->_page->getRequest();
-    }
-
-    /**
-     *    Accessor for raw header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getHeaders() {
-        return $this->_page->getHeaders();
-    }
-
-    /**
-     *    Accessor for raw page information.
-     *    @return string      Original text content of web page.
-     *    @access public
-     */
-    function getContent() {
-        return $this->_page->getRaw();
-    }
-
-    /**
-     *    Accessor for plain text version of the page.
-     *    @return string      Normalised text representation.
-     *    @access public
-     */
-    function getContentAsText() {
-        return $this->_page->getText();
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        return $this->_page->getTitle();
-    }
-
-    /**
-     *    Accessor for a list of all links in current page.
-     *    @return array   List of urls with scheme of
-     *                    http or https and hostname.
-     *    @access public
-     */
-    function getUrls() {
-        return $this->_page->getUrls();
-    }
-
-    /**
-     *    Sets all form fields with that name.
-     *    @param string $label   Name or label of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setField($label, $value, $position=false) {
-        return $this->_page->setField(new SimpleByLabelOrName($label), $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that name. Will use label if
-     *    one is available (not yet implemented).
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldByName($name, $value, $position=false) {
-        return $this->_page->setField(new SimpleByName($name), $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that id attribute.
-     *    @param string/integer $id   Id of field in forms.
-     *    @param string $value        New value of field.
-     *    @return boolean             True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldById($id, $value) {
-        return $this->_page->setField(new SimpleById($id), $value);
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    Finds the first match.
-     *    @param string $label       Field label.
-     *    @return string/boolean     A value if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getField($label) {
-        return $this->_page->getField(new SimpleByLabelOrName($label));
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    Finds the first match.
-     *    @param string $name        Field name.
-     *    @return string/boolean     A string if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getFieldByName($name) {
-        return $this->_page->getField(new SimpleByName($name));
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    @param string/integer $id  Id of field in forms.
-     *    @return string/boolean     A string if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getFieldById($id) {
-        return $this->_page->getField(new SimpleById($id));
-    }
-
-    /**
-     *    Clicks the submit button by label. The owning
-     *    form will be submitted by this.
-     *    @param string $label    Button label. An unlabeled
-     *                            button can be triggered by 'Submit'.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmit($label = 'Submit', $additional = false) {
-        if (! ($form = &$this->_page->getFormBySubmit(new SimpleByLabel($label)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitButton(new SimpleByLabel($label), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit button by name attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $name     Button name.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmitByName($name, $additional = false) {
-        if (! ($form = &$this->_page->getFormBySubmit(new SimpleByName($name)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitButton(new SimpleByName($name), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit button by ID attribute of the button
-     *    itself. The owning form will be submitted by this.
-     *    @param string $id       Button ID.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmitById($id, $additional = false) {
-        if (! ($form = &$this->_page->getFormBySubmit(new SimpleById($id)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitButton(new SimpleById($id), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Tests to see if a submit button exists with this
-     *    label.
-     *    @param string $label    Button label.
-     *    @return boolean         True if present.
-     *    @access public
-     */
-    function isSubmit($label) {
-        return (boolean)$this->_page->getFormBySubmit(new SimpleByLabel($label));
-    }
-
-    /**
-     *    Clicks the submit image by some kind of label. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $label    ID attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickImage($label, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = &$this->_page->getFormByImage(new SimpleByLabel($label)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit image by the name. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $name     Name attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = &$this->_page->getFormByImage(new SimpleByName($name)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitImage(new SimpleByName($name), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit image by ID attribute. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param integer/string $id    ID attribute of button.
-     *    @param integer $x            X-coordinate of imaginary click.
-     *    @param integer $y            Y-coordinate of imaginary click.
-     *    @param hash $additional      Additional form data.
-     *    @return string/boolean       Page on success.
-     *    @access public
-     */
-    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = &$this->_page->getFormByImage(new SimpleById($id)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitImage(new SimpleById($id), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Tests to see if an image exists with this
-     *    title or alt text.
-     *    @param string $label    Image text.
-     *    @return boolean         True if present.
-     *    @access public
-     */
-    function isImage($label) {
-        return (boolean)$this->_page->getFormByImage(new SimpleByLabel($label));
-    }
-
-    /**
-     *    Submits a form by the ID.
-     *    @param string $id       The form ID. No submit button value
-     *                            will be sent.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function submitFormById($id) {
-        if (! ($form = &$this->_page->getFormById($id))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submit());
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Finds a URL by label. Will find the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. The match ignores case and
-     *    white space issues.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return string/boolean   URL on success.
-     *    @access public
-     */
-    function getLink($label, $index = 0) {
-        $urls = $this->_page->getUrlsByLabel($label);
-        if (count($urls) == 0) {
-            return false;
-        }
-        if (count($urls) < $index + 1) {
-            return false;
-        }
-        return $urls[$index];
-    }
-
-    /**
-     *    Follows a link by label. Will click the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. The match ignores case and
-     *    white space issues.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return string/boolean   Page on success.
-     *    @access public
-     */
-    function clickLink($label, $index = 0) {
-        $url = $this->getLink($label, $index);
-        if ($url === false) {
-            return false;
-        }
-        $this->_load($url, new SimpleGetEncoding());
-        return $this->getContent();
-    }
-
-    /**
-     *    Finds a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return string/boolean   URL on success.
-     *    @access public
-     */
-    function getLinkById($id) {
-        return $this->_page->getUrlById($id);
-    }
-
-    /**
-     *    Follows a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return string/boolean   Page on success.
-     *    @access public
-     */
-    function clickLinkById($id) {
-        if (! ($url = $this->getLinkById($id))) {
-            return false;
-        }
-        $this->_load($url, new SimpleGetEncoding());
-        return $this->getContent();
-    }
-
-    /**
-     *    Clicks a visible text item. Will first try buttons,
-     *    then links and then images.
-     *    @param string $label        Visible text or alt text.
-     *    @return string/boolean      Raw page or false.
-     *    @access public
-     */
-    function click($label) {
-        $raw = $this->clickSubmit($label);
-        if (! $raw) {
-            $raw = $this->clickLink($label);
-        }
-        if (! $raw) {
-            $raw = $this->clickImage($label);
-        }
-        return $raw;
-    }
-
-    /**
-     *    Tests to see if a click target exists.
-     *    @param string $label    Visible text or alt text.
-     *    @return boolean         True if target present.
-     *    @access public
-     */
-    function isClickable($label) {
-        return $this->isSubmit($label) || ($this->getLink($label) !== false) || $this->isImage($label);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/collector.php b/tests/simpletest/collector.php
deleted file mode 100755
index abd70ef9c6..0000000000
--- a/tests/simpletest/collector.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * This file contains the following classes: {@link SimpleCollector},
- * {@link SimplePatternCollector}.
- *
- * @author Travis Swicegood <development@domain51.com>
- * @package SimpleTest
- * @subpackage UnitTester
- * @version $Id: collector.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**
- * The basic collector for {@link GroupTest}
- *
- * @see collect(), GroupTest::collect()
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleCollector {
-
-    /**
-     * Strips off any kind of slash at the end so as to normalise the path.
-     * @param string $path    Path to normalise.
-     * @return string         Path without trailing slash.
-     */
-    function _removeTrailingSlash($path) {
-        if (substr($path, -1) == DIRECTORY_SEPARATOR) {
-            return substr($path, 0, -1);
-        } elseif (substr($path, -1) == '/') {
-            return substr($path, 0, -1);
-        } else {
-            return $path;
-        }
-    }
-
-    /**
-     * Scans the directory and adds what it can.
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @see _attemptToAdd()
-     */
-    function collect(&$test, $path) {
-        $path = $this->_removeTrailingSlash($path);
-        if ($handle = opendir($path)) {
-            while (($entry = readdir($handle)) !== false) {
-                if ($this->_isHidden($entry)) {
-                    continue;
-                }
-                $this->_handle($test, $path . DIRECTORY_SEPARATOR . $entry);
-            }
-            closedir($handle);
-        }
-    }
-
-    /**
-     * This method determines what should be done with a given file and adds
-     * it via {@link GroupTest::addTestFile()} if necessary.
-     *
-     * This method should be overriden to provide custom matching criteria,
-     * such as pattern matching, recursive matching, etc.  For an example, see
-     * {@link SimplePatternCollector::_handle()}.
-     *
-     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $filename  A filename as generated by {@link collect()}
-     * @see collect()
-     * @access protected
-     */
-    function _handle(&$test, $file) {
-        if (is_dir($file)) {
-            return;
-        }
-        $test->addTestFile($file);
-    }
-
-    /**
-     *  Tests for hidden files so as to skip them. Currently
-     *  only tests for Unix hidden files.
-     *  @param string $filename        Plain filename.
-     *  @return boolean                True if hidden file.
-     *  @access private
-     */
-    function _isHidden($filename) {
-        return strncmp($filename, '.', 1) == 0;
-    }
-}
-
-/**
- * An extension to {@link SimpleCollector} that only adds files matching a
- * given pattern.
- *
- * @package SimpleTest
- * @subpackage UnitTester
- * @see SimpleCollector
- */
-class SimplePatternCollector extends SimpleCollector {
-    var $_pattern;
-
-    /**
-     *
-     * @param string $pattern   Perl compatible regex to test name against
-     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
-     *  for full documentation of valid pattern.s
-     */
-    function SimplePatternCollector($pattern = '/php$/i') {
-        $this->_pattern = $pattern;
-    }
-
-    /**
-     * Attempts to add files that match a given pattern.
-     *
-     * @see SimpleCollector::_handle()
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @access protected
-     */
-    function _handle(&$test, $filename) {
-        if (preg_match($this->_pattern, $filename)) {
-            parent::_handle($test, $filename);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/compatibility.php b/tests/simpletest/compatibility.php
deleted file mode 100755
index 73570dfda3..0000000000
--- a/tests/simpletest/compatibility.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @version    $Id: compatibility.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**
- *  Static methods for compatibility between different
- *  PHP versions.
- *  @package    SimpleTest
- */
-class SimpleTestCompatibility {
-
-    /**
-     *    Creates a copy whether in PHP5 or PHP4.
-     *    @param object $object     Thing to copy.
-     *    @return object            A copy.
-     *    @access public
-     *    @static
-     */
-    function copy($object) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            $copy = null;
-            eval('$copy = clone $object;');
-            return $copy;
-        }
-        return $object;
-    }
-
-    /**
-     *    Identity test. Drops back to equality + types for PHP5
-     *    objects as the === operator counts as the
-     *    stronger reference constraint.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if identical.
-     *    @access public
-     *    @static
-     */
-    function isIdentical($first, $second) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            return SimpleTestCompatibility::_isIdenticalType($first, $second);
-        }
-        if ($first != $second) {
-            return false;
-        }
-        return ($first === $second);
-    }
-
-    /**
-     *    Recursive type test.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if same type.
-     *    @access private
-     *    @static
-     */
-    function _isIdenticalType($first, $second) {
-        if (gettype($first) != gettype($second)) {
-            return false;
-        }
-        if (is_object($first) && is_object($second)) {
-            if (get_class($first) != get_class($second)) {
-                return false;
-            }
-            return SimpleTestCompatibility::_isArrayOfIdenticalTypes(
-                    get_object_vars($first),
-                    get_object_vars($second));
-        }
-        if (is_array($first) && is_array($second)) {
-            return SimpleTestCompatibility::_isArrayOfIdenticalTypes($first, $second);
-        }
-        if ($first !== $second) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Recursive type test for each element of an array.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if identical.
-     *    @access private
-     *    @static
-     */
-    function _isArrayOfIdenticalTypes($first, $second) {
-        if (array_keys($first) != array_keys($second)) {
-            return false;
-        }
-        foreach (array_keys($first) as $key) {
-            $is_identical = SimpleTestCompatibility::_isIdenticalType(
-                    $first[$key],
-                    $second[$key]);
-            if (! $is_identical) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Test for two variables being aliases.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if same.
-     *    @access public
-     *    @static
-     */
-    function isReference(&$first, &$second) {
-        if (version_compare(phpversion(), '5', '>=') && is_object($first)) {
-            return ($first === $second);
-        }
-        if (is_object($first) && is_object($second)) {
-            $id = uniqid("test");
-            $first->$id = true;
-            $is_ref = isset($second->$id);
-            unset($first->$id);
-            return $is_ref;
-        }
-        $temp = $first;
-        $first = uniqid("test");
-        $is_ref = ($first === $second);
-        $first = $temp;
-        return $is_ref;
-    }
-
-    /**
-     *    Test to see if an object is a member of a
-     *    class hiearchy.
-     *    @param object $object    Object to test.
-     *    @param string $class     Root name of hiearchy.
-     *    @return boolean         True if class in hiearchy.
-     *    @access public
-     *    @static
-     */
-    function isA($object, $class) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            if (! class_exists($class, false)) {
-                if (function_exists('interface_exists')) {
-                    if (! interface_exists($class, false))  {
-                        return false;
-                    }
-                }
-            }
-            $is_a = null;
-            eval("\$is_a = \$object instanceof $class;");
-            return $is_a;
-        }
-        if (function_exists('is_a')) {
-            return is_a($object, $class);
-        }
-        return ((strtolower($class) == get_class($object))
-                or (is_subclass_of($object, $class)));
-    }
-
-    /**
-     *    Sets a socket timeout for each chunk.
-     *    @param resource $handle    Socket handle.
-     *    @param integer $timeout    Limit in seconds.
-     *    @access public
-     *    @static
-     */
-    function setTimeout($handle, $timeout) {
-        if (function_exists('stream_set_timeout')) {
-            stream_set_timeout($handle, $timeout, 0);
-        } elseif (function_exists('socket_set_timeout')) {
-            socket_set_timeout($handle, $timeout, 0);
-        } elseif (function_exists('set_socket_timeout')) {
-            set_socket_timeout($handle, $timeout, 0);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/cookies.php b/tests/simpletest/cookies.php
deleted file mode 100755
index a48c4b53cd..0000000000
--- a/tests/simpletest/cookies.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: cookies.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/url.php');
-/**#@-*/
-
-/**
- *    Cookie data holder. Cookie rules are full of pretty
- *    arbitary stuff. I have used...
- *    http://wp.netscape.com/newsref/std/cookie_spec.html
- *    http://www.cookiecentral.com/faq/
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCookie {
-    var $_host;
-    var $_name;
-    var $_value;
-    var $_path;
-    var $_expiry;
-    var $_is_secure;
-
-    /**
-     *    Constructor. Sets the stored values.
-     *    @param string $name            Cookie key.
-     *    @param string $value           Value of cookie.
-     *    @param string $path            Cookie path if not host wide.
-     *    @param string $expiry          Expiry date as string.
-     *    @param boolean $is_secure      Currently ignored.
-     */
-    function SimpleCookie($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
-        $this->_host = false;
-        $this->_name = $name;
-        $this->_value = $value;
-        $this->_path = ($path ? $this->_fixPath($path) : "/");
-        $this->_expiry = false;
-        if (is_string($expiry)) {
-            $this->_expiry = strtotime($expiry);
-        } elseif (is_integer($expiry)) {
-            $this->_expiry = $expiry;
-        }
-        $this->_is_secure = $is_secure;
-    }
-
-    /**
-     *    Sets the host. The cookie rules determine
-     *    that the first two parts are taken for
-     *    certain TLDs and three for others. If the
-     *    new host does not match these rules then the
-     *    call will fail.
-     *    @param string $host       New hostname.
-     *    @return boolean           True if hostname is valid.
-     *    @access public
-     */
-    function setHost($host) {
-        if ($host = $this->_truncateHost($host)) {
-            $this->_host = $host;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for the truncated host to which this
-     *    cookie applies.
-     *    @return string       Truncated hostname.
-     *    @access public
-     */
-    function getHost() {
-        return $this->_host;
-    }
-
-    /**
-     *    Test for a cookie being valid for a host name.
-     *    @param string $host    Host to test against.
-     *    @return boolean        True if the cookie would be valid
-     *                           here.
-     */
-    function isValidHost($host) {
-        return ($this->_truncateHost($host) === $this->getHost());
-    }
-
-    /**
-     *    Extracts just the domain part that determines a
-     *    cookie's host validity.
-     *    @param string $host    Host name to truncate.
-     *    @return string        Domain or false on a bad host.
-     *    @access private
-     */
-    function _truncateHost($host) {
-        $tlds = SimpleUrl::getAllTopLevelDomains();
-        if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
-            return $matches[0];
-        } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
-            return $matches[0];
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for name.
-     *    @return string       Cookie key.
-     *    @access public
-     */
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     *    Accessor for value. A deleted cookie will
-     *    have an empty string for this.
-     *    @return string       Cookie value.
-     *    @access public
-     */
-    function getValue() {
-        return $this->_value;
-    }
-
-    /**
-     *    Accessor for path.
-     *    @return string       Valid cookie path.
-     *    @access public
-     */
-    function getPath() {
-        return $this->_path;
-    }
-
-    /**
-     *    Tests a path to see if the cookie applies
-     *    there. The test path must be longer or
-     *    equal to the cookie path.
-     *    @param string $path       Path to test against.
-     *    @return boolean           True if cookie valid here.
-     *    @access public
-     */
-    function isValidPath($path) {
-        return (strncmp(
-                $this->_fixPath($path),
-                $this->getPath(),
-                strlen($this->getPath())) == 0);
-    }
-
-    /**
-     *    Accessor for expiry.
-     *    @return string       Expiry string.
-     *    @access public
-     */
-    function getExpiry() {
-        if (! $this->_expiry) {
-            return false;
-        }
-        return gmdate("D, d M Y H:i:s", $this->_expiry) . " GMT";
-    }
-
-    /**
-     *    Test to see if cookie is expired against
-     *    the cookie format time or timestamp.
-     *    Will give true for a session cookie.
-     *    @param integer/string $now  Time to test against. Result
-     *                                will be false if this time
-     *                                is later than the cookie expiry.
-     *                                Can be either a timestamp integer
-     *                                or a cookie format date.
-     *    @access public
-     */
-    function isExpired($now) {
-        if (! $this->_expiry) {
-            return true;
-        }
-        if (is_string($now)) {
-            $now = strtotime($now);
-        }
-        return ($this->_expiry < $now);
-    }
-
-    /**
-     *    Ages the cookie by the specified number of
-     *    seconds.
-     *    @param integer $interval   In seconds.
-     *    @public
-     */
-    function agePrematurely($interval) {
-        if ($this->_expiry) {
-            $this->_expiry -= $interval;
-        }
-    }
-
-    /**
-     *    Accessor for the secure flag.
-     *    @return boolean       True if cookie needs SSL.
-     *    @access public
-     */
-    function isSecure() {
-        return $this->_is_secure;
-    }
-
-    /**
-     *    Adds a trailing and leading slash to the path
-     *    if missing.
-     *    @param string $path            Path to fix.
-     *    @access private
-     */
-    function _fixPath($path) {
-        if (substr($path, 0, 1) != '/') {
-            $path = '/' . $path;
-        }
-        if (substr($path, -1, 1) != '/') {
-            $path .= '/';
-        }
-        return $path;
-    }
-}
-
-/**
- *    Repository for cookies. This stuff is a
- *    tiny bit browser dependent.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCookieJar {
-    var $_cookies;
-
-    /**
-     *    Constructor. Jar starts empty.
-     *    @access public
-     */
-    function SimpleCookieJar() {
-        $this->_cookies = array();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened.
-     *    @param string/integer $now   Time to test expiry against.
-     *    @access public
-     */
-    function restartSession($date = false) {
-        $surviving_cookies = array();
-        for ($i = 0; $i < count($this->_cookies); $i++) {
-            if (! $this->_cookies[$i]->getValue()) {
-                continue;
-            }
-            if (! $this->_cookies[$i]->getExpiry()) {
-                continue;
-            }
-            if ($date && $this->_cookies[$i]->isExpired($date)) {
-                continue;
-            }
-            $surviving_cookies[] = $this->_cookies[$i];
-        }
-        $this->_cookies = $surviving_cookies;
-    }
-
-    /**
-     *    Ages all cookies in the cookie jar.
-     *    @param integer $interval     The old session is moved
-     *                                 into the past by this number
-     *                                 of seconds. Cookies now over
-     *                                 age will be removed.
-     *    @access public
-     */
-    function agePrematurely($interval) {
-        for ($i = 0; $i < count($this->_cookies); $i++) {
-            $this->_cookies[$i]->agePrematurely($interval);
-        }
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name       Cookie key.
-     *    @param string $value      Value of cookie.
-     *    @param string $host       Host upon which the cookie is valid.
-     *    @param string $path       Cookie path if not host wide.
-     *    @param string $expiry     Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $cookie = new SimpleCookie($name, $value, $path, $expiry);
-        if ($host) {
-            $cookie->setHost($host);
-        }
-        $this->_cookies[$this->_findFirstMatch($cookie)] = $cookie;
-    }
-
-    /**
-     *    Finds a matching cookie to write over or the
-     *    first empty slot if none.
-     *    @param SimpleCookie $cookie    Cookie to write into jar.
-     *    @return integer                Available slot.
-     *    @access private
-     */
-    function _findFirstMatch($cookie) {
-        for ($i = 0; $i < count($this->_cookies); $i++) {
-            $is_match = $this->_isMatch(
-                    $cookie,
-                    $this->_cookies[$i]->getHost(),
-                    $this->_cookies[$i]->getPath(),
-                    $this->_cookies[$i]->getName());
-            if ($is_match) {
-                return $i;
-            }
-        }
-        return count($this->_cookies);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies. Looks for the longest path that
-     *    matches.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        $longest_path = '';
-        foreach ($this->_cookies as $cookie) {
-            if ($this->_isMatch($cookie, $host, $path, $name)) {
-                if (strlen($cookie->getPath()) > strlen($longest_path)) {
-                    $value = $cookie->getValue();
-                    $longest_path = $cookie->getPath();
-                }
-            }
-        }
-        return (isset($value) ? $value : false);
-    }
-
-    /**
-     *    Tests cookie for matching against search
-     *    criteria.
-     *    @param SimpleTest $cookie    Cookie to test.
-     *    @param string $host          Host must match.
-     *    @param string $path          Cookie path must be shorter than
-     *                                 this path.
-     *    @param string $name          Name must match.
-     *    @return boolean              True if matched.
-     *    @access private
-     */
-    function _isMatch($cookie, $host, $path, $name) {
-        if ($cookie->getName() != $name) {
-            return false;
-        }
-        if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
-            return false;
-        }
-        if (! $cookie->isValidPath($path)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Uses a URL to sift relevant cookies by host and
-     *    path. Results are list of strings of form "name=value".
-     *    @param SimpleUrl $url       Url to select by.
-     *    @return array               Valid name and value pairs.
-     *    @access public
-     */
-    function selectAsPairs($url) {
-        $pairs = array();
-        foreach ($this->_cookies as $cookie) {
-            if ($this->_isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
-                $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
-            }
-        }
-        return $pairs;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/default_reporter.php b/tests/simpletest/default_reporter.php
deleted file mode 100755
index 58e2aa52c1..0000000000
--- a/tests/simpletest/default_reporter.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- *  Optional include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: default_reporter.php 1704 2008-03-25 00:47:04Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/reporter.php');
-require_once(dirname(__FILE__) . '/xml.php');
-/**#@-*/
-
-/**
- *    Parser for command line arguments. Extracts
- *    the a specific test to run and engages XML
- *    reporting when necessary.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleCommandLineParser {
-    var $_to_property = array(
-            'case' => '_case', 'c' => '_case',
-            'test' => '_test', 't' => '_test',
-            'xml' => '_xml', 'x' => '_xml');
-    var $_case = '';
-    var $_test = '';
-    var $_xml = false;
-    var $_no_skips = false;
-
-    /**
-     *    Parses raw command line arguments into object properties.
-     *    @param string $arguments        Raw commend line arguments.
-     */
-    function SimpleCommandLineParser($arguments) {
-        if (! is_array($arguments)) {
-            return;
-        }
-        foreach ($arguments as $i => $argument) {
-            if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
-                $property = $this->_to_property[$matches[1]];
-                $this->$property = $matches[2];
-            } elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
-                $property = $this->_to_property[$matches[1]];
-                if (isset($arguments[$i + 1])) {
-                    $this->$property = $arguments[$i + 1];
-                }
-            } elseif (preg_match('/^--?(xml|x)$/', $argument)) {
-                $this->_xml = true;
-            } elseif (preg_match('/^--?(no-skip|no-skips|s)$/', $argument)) {
-                $this->_no_skips = true;
-            }
-        }
-    }
-
-    /**
-     *    Run only this test.
-     *    @return string        Test name to run.
-     *    @access public
-     */
-    function getTest() {
-        return $this->_test;
-    }
-
-    /**
-     *    Run only this test suite.
-     *    @return string        Test class name to run.
-     *    @access public
-     */
-    function getTestCase() {
-        return $this->_case;
-    }
-
-    /**
-     *    Output should be XML or not.
-     *    @return boolean        True if XML desired.
-     *    @access public
-     */
-    function isXml() {
-        return $this->_xml;
-    }
-
-    /**
-     *    Output should suppress skip messages.
-     *    @return boolean        True for no skips.
-     *    @access public
-     */
-    function noSkips() {
-        return $this->_no_skips;
-    }
-}
-
-/**
- *    The default reporter used by SimpleTest's autorun
- *    feature. The actual reporters used are dependency
- *    injected and can be overridden.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class DefaultReporter extends SimpleReporterDecorator {
-
-    /**
-     *  Assembles the appopriate reporter for the environment.
-     */
-    function DefaultReporter() {
-        if (SimpleReporter::inCli()) {
-            global $argv;
-            $parser = new SimpleCommandLineParser($argv);
-            $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
-            $reporter = &new SelectiveReporter(
-                    SimpleTest::preferred($interfaces),
-                    $parser->getTestCase(),
-                    $parser->getTest());
-            if ($parser->noSkips()) {
-                $reporter = &new NoSkipsReporter($reporter);
-            }
-        } else {
-            $reporter = &new SelectiveReporter(
-                    SimpleTest::preferred('HtmlReporter'),
-                    @$_GET['c'],
-                    @$_GET['t']);
-            if (@$_GET['skips'] == 'no' || @$_GET['show-skips'] == 'no') {
-                $reporter = &new NoSkipsReporter($reporter);
-            }
-        }
-        $this->SimpleReporterDecorator($reporter);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/detached.php b/tests/simpletest/detached.php
deleted file mode 100755
index e323d8cd53..0000000000
--- a/tests/simpletest/detached.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: detached.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/xml.php');
-require_once(dirname(__FILE__) . '/shell_tester.php');
-/**#@-*/
-
-/**
- *    Runs an XML formated test in a separate process.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class DetachedTestCase {
-    var $_command;
-    var $_dry_command;
-    var $_size;
-
-    /**
-     *    Sets the location of the remote test.
-     *    @param string $command       Test script.
-     *    @param string $dry_command   Script for dry run.
-     *    @access public
-     */
-    function DetachedTestCase($command, $dry_command = false) {
-        $this->_command = $command;
-        $this->_dry_command = $dry_command ? $dry_command : $command;
-        $this->_size = false;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string       Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_command;
-    }
-
-    /**
-     *    Runs the top level test for this class. Currently
-     *    reads the data as a single chunk. I'll fix this
-     *    once I have added iteration to the browser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @returns boolean                   True if no failures.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $shell = &new SimpleShell();
-        $shell->execute($this->_command);
-        $parser = &$this->_createParser($reporter);
-        if (! $parser->parse($shell->getOutput())) {
-            trigger_error('Cannot parse incoming XML from [' . $this->_command . ']');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Accessor for the number of subtests.
-     *    @return integer       Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        if ($this->_size === false) {
-            $shell = &new SimpleShell();
-            $shell->execute($this->_dry_command);
-            $reporter = &new SimpleReporter();
-            $parser = &$this->_createParser($reporter);
-            if (! $parser->parse($shell->getOutput())) {
-                trigger_error('Cannot parse incoming XML from [' . $this->_dry_command . ']');
-                return false;
-            }
-            $this->_size = $reporter->getTestCaseCount();
-        }
-        return $this->_size;
-    }
-
-    /**
-     *    Creates the XML parser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @return SimpleTestXmlListener      XML reader.
-     *    @access protected
-     */
-    function &_createParser(&$reporter) {
-        return new SimpleTestXmlParser($reporter);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/dumper.php b/tests/simpletest/dumper.php
deleted file mode 100755
index a1758288fe..0000000000
--- a/tests/simpletest/dumper.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: dumper.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-/**
- * does type matter
- */
-if (! defined('TYPE_MATTERS')) {
-    define('TYPE_MATTERS', true);
-}
-
-/**
- *    Displays variables as text and does diffs.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleDumper {
-
-    /**
-     *    Renders a variable in a shorter form than print_r().
-     *    @param mixed $value      Variable to render as a string.
-     *    @return string           Human readable string form.
-     *    @access public
-     */
-    function describeValue($value) {
-        $type = $this->getType($value);
-        switch($type) {
-            case "Null":
-                return "NULL";
-            case "Boolean":
-                return "Boolean: " . ($value ? "true" : "false");
-            case "Array":
-                return "Array: " . count($value) . " items";
-            case "Object":
-                return "Object: of " . get_class($value);
-            case "String":
-                return "String: " . $this->clipString($value, 200);
-            default:
-                return "$type: $value";
-        }
-        return "Unknown";
-    }
-
-    /**
-     *    Gets the string representation of a type.
-     *    @param mixed $value    Variable to check against.
-     *    @return string         Type.
-     *    @access public
-     */
-    function getType($value) {
-        if (! isset($value)) {
-            return "Null";
-        } elseif (is_bool($value)) {
-            return "Boolean";
-        } elseif (is_string($value)) {
-            return "String";
-        } elseif (is_integer($value)) {
-            return "Integer";
-        } elseif (is_float($value)) {
-            return "Float";
-        } elseif (is_array($value)) {
-            return "Array";
-        } elseif (is_resource($value)) {
-            return "Resource";
-        } elseif (is_object($value)) {
-            return "Object";
-        }
-        return "Unknown";
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two variables. Uses a
-     *    dynamic call.
-     *    @param mixed $first        First variable.
-     *    @param mixed $second       Value to compare with.
-     *    @param boolean $identical  If true then type anomolies count.
-     *    @return string             Description of difference.
-     *    @access public
-     */
-    function describeDifference($first, $second, $identical = false) {
-        if ($identical) {
-            if (! $this->_isTypeMatch($first, $second)) {
-                return "with type mismatch as [" . $this->describeValue($first) .
-                    "] does not match [" . $this->describeValue($second) . "]";
-            }
-        }
-        $type = $this->getType($first);
-        if ($type == "Unknown") {
-            return "with unknown type";
-        }
-        $method = '_describe' . $type . 'Difference';
-        return $this->$method($first, $second, $identical);
-    }
-
-    /**
-     *    Tests to see if types match.
-     *    @param mixed $first        First variable.
-     *    @param mixed $second       Value to compare with.
-     *    @return boolean            True if matches.
-     *    @access private
-     */
-    function _isTypeMatch($first, $second) {
-        return ($this->getType($first) == $this->getType($second));
-    }
-
-    /**
-     *    Clips a string to a maximum length.
-     *    @param string $value         String to truncate.
-     *    @param integer $size         Minimum string size to show.
-     *    @param integer $position     Centre of string section.
-     *    @return string               Shortened version.
-     *    @access public
-     */
-    function clipString($value, $size, $position = 0) {
-        $length = strlen($value);
-        if ($length <= $size) {
-            return $value;
-        }
-        $position = min($position, $length);
-        $start = ($size/2 > $position ? 0 : $position - $size/2);
-        if ($start + $size > $length) {
-            $start = $length - $size;
-        }
-        $value = substr($value, $start, $size);
-        return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two variables. The minimal
-     *    version.
-     *    @param null $first          First value.
-     *    @param mixed $second        Value to compare with.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeGenericDifference($first, $second) {
-        return "as [" . $this->describeValue($first) .
-                "] does not match [" .
-                $this->describeValue($second) . "]";
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a null and another variable.
-     *    @param null $first          First null.
-     *    @param mixed $second        Null to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeNullDifference($first, $second, $identical) {
-        return $this->_describeGenericDifference($first, $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a boolean and another variable.
-     *    @param boolean $first       First boolean.
-     *    @param mixed $second        Boolean to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeBooleanDifference($first, $second, $identical) {
-        return $this->_describeGenericDifference($first, $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a string and another variable.
-     *    @param string $first        First string.
-     *    @param mixed $second        String to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeStringDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        $position = $this->_stringDiffersAt($first, $second);
-        $message = "at character $position";
-        $message .= " with [" .
-                $this->clipString($first, 200, $position) . "] and [" .
-                $this->clipString($second, 200, $position) . "]";
-        return $message;
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between an integer and another variable.
-     *    @param integer $first       First number.
-     *    @param mixed $second        Number to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeIntegerDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        return "because [" . $this->describeValue($first) .
-                "] differs from [" .
-                $this->describeValue($second) . "] by " .
-                abs($first - $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two floating point numbers.
-     *    @param float $first         First float.
-     *    @param mixed $second        Float to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeFloatDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        return "because [" . $this->describeValue($first) .
-                "] differs from [" .
-                $this->describeValue($second) . "] by " .
-                abs($first - $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two arrays.
-     *    @param array $first         First array.
-     *    @param mixed $second        Array to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeArrayDifference($first, $second, $identical) {
-        if (! is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        if (! $this->_isMatchingKeys($first, $second, $identical)) {
-            return "as key list [" .
-                    implode(", ", array_keys($first)) . "] does not match key list [" .
-                    implode(", ", array_keys($second)) . "]";
-        }
-        foreach (array_keys($first) as $key) {
-            if ($identical && ($first[$key] === $second[$key])) {
-                continue;
-            }
-            if (! $identical && ($first[$key] == $second[$key])) {
-                continue;
-            }
-            return "with member [$key] " . $this->describeDifference(
-                    $first[$key],
-                    $second[$key],
-                    $identical);
-        }
-        return "";
-    }
-
-    /**
-     *    Compares two arrays to see if their key lists match.
-     *    For an identical match, the ordering and types of the keys
-     *    is significant.
-     *    @param array $first         First array.
-     *    @param array $second        Array to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return boolean             True if matching.
-     *    @access private
-     */
-    function _isMatchingKeys($first, $second, $identical) {
-        $first_keys = array_keys($first);
-        $second_keys = array_keys($second);
-        if ($identical) {
-            return ($first_keys === $second_keys);
-        }
-        sort($first_keys);
-        sort($second_keys);
-        return ($first_keys == $second_keys);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a resource and another variable.
-     *    @param resource $first       First resource.
-     *    @param mixed $second         Resource to compare with.
-     *    @param boolean $identical    If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeResourceDifference($first, $second, $identical) {
-        return $this->_describeGenericDifference($first, $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two objects.
-     *    @param object $first        First object.
-     *    @param mixed $second        Object to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeObjectDifference($first, $second, $identical) {
-        if (! is_object($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        return $this->_describeArrayDifference(
-                get_object_vars($first),
-                get_object_vars($second),
-                $identical);
-    }
-
-    /**
-     *    Find the first character position that differs
-     *    in two strings by binary chop.
-     *    @param string $first        First string.
-     *    @param string $second       String to compare with.
-     *    @return integer             Position of first differing
-     *                                character.
-     *    @access private
-     */
-    function _stringDiffersAt($first, $second) {
-        if (! $first || ! $second) {
-            return 0;
-        }
-        if (strlen($first) < strlen($second)) {
-            list($first, $second) = array($second, $first);
-        }
-        $position = 0;
-        $step = strlen($first);
-        while ($step > 1) {
-            $step = (integer)(($step + 1) / 2);
-            if (strncmp($first, $second, $position + $step) == 0) {
-                $position += $step;
-            }
-        }
-        return $position;
-    }
-
-    /**
-     *    Sends a formatted dump of a variable to a string.
-     *    @param mixed $variable    Variable to display.
-     *    @return string            Output from print_r().
-     *    @access public
-     *    @static
-     */
-    function dump($variable) {
-        ob_start();
-        print_r($variable);
-        $formatted = ob_get_contents();
-        ob_end_clean();
-        return $formatted;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/eclipse.php b/tests/simpletest/eclipse.php
deleted file mode 100755
index 67811d30fc..0000000000
--- a/tests/simpletest/eclipse.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- *  base include file for eclipse plugin
- *  @package    SimpleTest
- *  @subpackage Eclipse
- *  @version    $Id: eclipse.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-/**#@+
- * simpletest include files
- */
-include_once 'unit_tester.php';
-include_once 'test_case.php';
-include_once 'invoker.php';
-include_once 'socket.php';
-include_once 'mock_objects.php';
-/**#@-*/
-
-/**
- *  base reported class for eclipse plugin
- *  @package    SimpleTest
- *  @subpackage Eclipse
- */
-class EclipseReporter extends SimpleScorer {
-
-    /**
-     *    Reporter to be run inside of Eclipse interface.
-     *    @param object $listener   Eclipse listener (?).
-     *    @param boolean $cc        Whether to include test coverage.
-     */
-    function EclipseReporter(&$listener, $cc=false){
-        $this->_listener = &$listener;
-        $this->SimpleScorer();
-        $this->_case = "";
-        $this->_group = "";
-        $this->_method = "";
-        $this->_cc = $cc;
-        $this->_error = false;
-        $this->_fail = false;
-    }
-
-    /**
-     *    Means to display human readable object comparisons.
-     *    @return SimpleDumper        Visual comparer.
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Localhost connection from Eclipse.
-     *    @param integer $port      Port to connect to Eclipse.
-     *    @param string $host       Normally localhost.
-     *    @return SimpleSocket      Connection to Eclipse.
-     */
-    function &createListener($port, $host="127.0.0.1"){
-        $tmplistener = &new SimpleSocket($host, $port, 5);
-        return $tmplistener;
-    }
-
-    /**
-     *    Wraps the test in an output buffer.
-     *    @param SimpleInvoker $invoker     Current test runner.
-     *    @return EclipseInvoker            Decorator with output buffering.
-     *    @access public
-     */
-    function &createInvoker(&$invoker){
-        $eclinvoker = &new EclipseInvoker($invoker, $this->_listener);
-        return $eclinvoker;
-    }
-
-    /**
-     *    C style escaping.
-     *    @param string $raw    String with backslashes, quotes and whitespace.
-     *    @return string        Replaced with C backslashed tokens.
-     */
-    function escapeVal($raw){
-        $needle = array("\\","\"","/","\b","\f","\n","\r","\t");
-        $replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
-        return str_replace($needle, $replace, $raw);
-    }
-
-    /**
-     *    Stash the first passing item. Clicking the test
-     *    item goes to first pass.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintPass($message){
-        if (! $this->_pass){
-            $this->_message = $this->escapeVal($message);
-        }
-        $this->_pass = true;
-    }
-
-    /**
-     *    Stash the first failing item. Clicking the test
-     *    item goes to first fail.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintFail($message){
-        //only get the first failure or error
-        if (! $this->_fail && ! $this->_error){
-            $this->_fail = true;
-            $this->_message = $this->escapeVal($message);
-            $this->_listener->write('{status:"fail",message:"'.$this->_message.'",group:"'.$this->_group.'",case:"'.$this->_case.'",method:"'.$this->_method.'"}');
-        }
-    }
-
-    /**
-     *    Stash the first error. Clicking the test
-     *    item goes to first error.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintError($message){
-        if (! $this->_fail && ! $this->_error){
-            $this->_error = true;
-            $this->_message = $this->escapeVal($message);
-            $this->_listener->write('{status:"error",message:"'.$this->_message.'",group:"'.$this->_group.'",case:"'.$this->_case.'",method:"'.$this->_method.'"}');
-        }
-    }
-
-
-    /**
-     *    Stash the first exception. Clicking the test
-     *    item goes to first message.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintException($exception){
-        if (! $this->_fail && ! $this->_error){
-            $this->_error = true;
-            $message = 'Unexpected exception of type[' . get_class($exception) .
-                    '] with message [' . $exception->getMessage() . '] in [' .
-                    $exception->getFile() .' line '. $exception->getLine() . ']';
-            $this->_message = $this->escapeVal($message);
-            $this->_listener->write(
-                    '{status:"error",message:"' . $this->_message . '",group:"' .
-                    $this->_group . '",case:"' . $this->_case . '",method:"' . $this->_method
-                    . '"}');
-        }
-    }
-
-
-    /**
-     *    We don't display any special header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-    }
-
-    /**
-     *    We don't display any special footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-    }
-
-    /**
-     *    Paints nothing at the start of a test method, but stash
-     *    the method name for later.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($method) {
-        $this->_pass = false;
-        $this->_fail = false;
-        $this->_error = false;
-        $this->_method = $this->escapeVal($method);
-    }
-
-    /**
-     *    Only send one message if the test passes, after that
-     *    suppress the message.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintMethodEnd($method){
-        if ($this->_fail || $this->_error || ! $this->_pass){
-        } else {
-            $this->_listener->write(
-                        '{status:"pass",message:"' . $this->_message . '",group:"' .
-                        $this->_group . '",case:"' . $this->_case . '",method:"' .
-                        $this->_method . '"}');
-        }
-    }
-
-    /**
-     *    Stashes the test case name for the later failure message.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($case){
-        $this->_case = $this->escapeVal($case);
-    }
-
-    /**
-     *    Drops the name.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($case){
-        $this->_case = "";
-    }
-
-    /**
-     *    Stashes the name of the test suite. Starts test coverage
-     *    if enabled.
-     *    @param string $group     Name of test or other label.
-     *    @param integer $size     Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($group, $size){
-        $this->_group = $this->escapeVal($group);
-        if ($this->_cc){
-            if (extension_loaded('xdebug')){
-                xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
-            }
-        }
-    }
-
-    /**
-     *    Paints coverage report if enabled.
-     *    @param string $group     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($group){
-        $this->_group = "";
-        $cc = "";
-        if ($this->_cc){
-            if (extension_loaded('xdebug')){
-                $arrfiles = xdebug_get_code_coverage();
-                xdebug_stop_code_coverage();
-                $thisdir = dirname(__FILE__);
-                $thisdirlen = strlen($thisdir);
-                foreach ($arrfiles as $index=>$file){
-                    if (substr($index, 0, $thisdirlen)===$thisdir){
-                        continue;
-                    }
-                    $lcnt = 0;
-                    $ccnt = 0;
-                    foreach ($file as $line){
-                        if ($line == -2){
-                            continue;
-                        }
-                        $lcnt++;
-                        if ($line==1){
-                            $ccnt++;
-                        }
-                    }
-                    if ($lcnt > 0){
-                        $cc .= round(($ccnt/$lcnt) * 100, 2) . '%';
-                    }else{
-                        $cc .= "0.00%";
-                    }
-                    $cc.= "\t". $index . "\n";
-                }
-            }
-        }
-        $this->_listener->write('{status:"coverage",message:"' .
-                                EclipseReporter::escapeVal($cc) . '"}');
-    }
-}
-
-/**
- *  Invoker decorator for Eclipse. Captures output until
- *  the end of the test.
- *  @package    SimpleTest
- *  @subpackage Eclipse
- */
-class EclipseInvoker extends SimpleInvokerDecorator{
-    function EclipseInvoker(&$invoker, &$listener) {
-        $this->_listener = &$listener;
-        $this->SimpleInvokerDecorator($invoker);
-    }
-
-    /**
-     *    Starts output buffering.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method){
-        ob_start();
-        $this->_invoker->before($method);
-    }
-
-    /**
-     *    Stops output buffering and send the captured output
-     *    to the listener.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->_invoker->after($method);
-        $output = ob_get_contents();
-        ob_end_clean();
-        if ($output !== ""){
-            $result = $this->_listener->write('{status:"info",message:"' .
-                                              EclipseReporter::escapeVal($output) . '"}');
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/encoding.php b/tests/simpletest/encoding.php
deleted file mode 100755
index 78050981a3..0000000000
--- a/tests/simpletest/encoding.php
+++ /dev/null
@@ -1,552 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: encoding.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/socket.php');
-/**#@-*/
-
-/**
- *    Single post parameter.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEncodedPair {
-    var $_key;
-    var $_value;
-
-    /**
-     *    Stashes the data for rendering later.
-     *    @param string $key       Form element name.
-     *    @param string $value     Data to send.
-     */
-    function SimpleEncodedPair($key, $value) {
-        $this->_key = $key;
-        $this->_value = $value;
-    }
-
-    /**
-     *    The pair as a single string.
-     *    @return string        Encoded pair.
-     *    @access public
-     */
-    function asRequest() {
-        return urlencode($this->_key) . '=' . urlencode($this->_value);
-    }
-
-    /**
-     *    The MIME part as a string.
-     *    @return string        MIME part encoding.
-     *    @access public
-     */
-    function asMime() {
-        $part = 'Content-Disposition: form-data; ';
-        $part .= "name=\"" . $this->_key . "\"\r\n";
-        $part .= "\r\n" . $this->_value;
-        return $part;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @param string $key    Identifier.
-     *    @return boolean       True if matched.
-     *    @access public
-     */
-    function isKey($key) {
-        return $key == $this->_key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Identifier.
-     *    @access public
-     */
-    function getKey() {
-        return $this->_key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Content.
-     *    @access public
-     */
-    function getValue() {
-        return $this->_value;
-    }
-}
-
-/**
- *    Single post parameter.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAttachment {
-    var $_key;
-    var $_content;
-    var $_filename;
-
-    /**
-     *    Stashes the data for rendering later.
-     *    @param string $key          Key to add value to.
-     *    @param string $content      Raw data.
-     *    @param hash $filename       Original filename.
-     */
-    function SimpleAttachment($key, $content, $filename) {
-        $this->_key = $key;
-        $this->_content = $content;
-        $this->_filename = $filename;
-    }
-
-    /**
-     *    The pair as a single string.
-     *    @return string        Encoded pair.
-     *    @access public
-     */
-    function asRequest() {
-        return '';
-    }
-
-    /**
-     *    The MIME part as a string.
-     *    @return string        MIME part encoding.
-     *    @access public
-     */
-    function asMime() {
-        $part = 'Content-Disposition: form-data; ';
-        $part .= 'name="' . $this->_key . '"; ';
-        $part .= 'filename="' . $this->_filename . '"';
-        $part .= "\r\nContent-Type: " . $this->_deduceMimeType();
-        $part .= "\r\n\r\n" . $this->_content;
-        return $part;
-    }
-
-    /**
-     *    Attempts to figure out the MIME type from the
-     *    file extension and the content.
-     *    @return string        MIME type.
-     *    @access private
-     */
-    function _deduceMimeType() {
-        if ($this->_isOnlyAscii($this->_content)) {
-            return 'text/plain';
-        }
-        return 'application/octet-stream';
-    }
-
-    /**
-     *    Tests each character is in the range 0-127.
-     *    @param string $ascii    String to test.
-     *    @access private
-     */
-    function _isOnlyAscii($ascii) {
-        for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
-            if (ord($ascii[$i]) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @param string $key    Identifier.
-     *    @return boolean       True if matched.
-     *    @access public
-     */
-    function isKey($key) {
-        return $key == $this->_key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Identifier.
-     *    @access public
-     */
-    function getKey() {
-        return $this->_key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Content.
-     *    @access public
-     */
-    function getValue() {
-        return $this->_filename;
-    }
-}
-
-/**
- *    Bundle of GET/POST parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEncoding {
-    var $_request;
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleEncoding($query = false) {
-        if (! $query) {
-            $query = array();
-        }
-        $this->clear();
-        $this->merge($query);
-    }
-
-    /**
-     *    Empties the request of parameters.
-     *    @access public
-     */
-    function clear() {
-        $this->_request = array();
-    }
-
-    /**
-     *    Adds a parameter to the query.
-     *    @param string $key            Key to add value to.
-     *    @param string/array $value    New data.
-     *    @access public
-     */
-    function add($key, $value) {
-        if ($value === false) {
-            return;
-        }
-        if (is_array($value)) {
-            foreach ($value as $item) {
-                $this->_addPair($key, $item);
-            }
-        } else {
-            $this->_addPair($key, $value);
-        }
-    }
-
-    /**
-     *    Adds a new value into the request.
-     *    @param string $key            Key to add value to.
-     *    @param string/array $value    New data.
-     *    @access private
-     */
-    function _addPair($key, $value) {
-        $this->_request[] = new SimpleEncodedPair($key, $value);
-    }
-
-    /**
-     *    Adds a MIME part to the query. Does nothing for a
-     *    form encoded packet.
-     *    @param string $key          Key to add value to.
-     *    @param string $content      Raw data.
-     *    @param hash $filename       Original filename.
-     *    @access public
-     */
-    function attach($key, $content, $filename) {
-        $this->_request[] = new SimpleAttachment($key, $content, $filename);
-    }
-
-    /**
-     *    Adds a set of parameters to this query.
-     *    @param array/SimpleQueryString $query  Multiple values are
-     *                                           as lists on a single key.
-     *    @access public
-     */
-    function merge($query) {
-        if (is_object($query)) {
-            $this->_request = array_merge($this->_request, $query->getAll());
-        } elseif (is_array($query)) {
-            foreach ($query as $key => $value) {
-                $this->add($key, $value);
-            }
-        }
-    }
-
-    /**
-     *    Accessor for single value.
-     *    @return string/array    False if missing, string
-     *                            if present and array if
-     *                            multiple entries.
-     *    @access public
-     */
-    function getValue($key) {
-        $values = array();
-        foreach ($this->_request as $pair) {
-            if ($pair->isKey($key)) {
-                $values[] = $pair->getValue();
-            }
-        }
-        if (count($values) == 0) {
-            return false;
-        } elseif (count($values) == 1) {
-            return $values[0];
-        } else {
-            return $values;
-        }
-    }
-
-    /**
-     *    Accessor for listing of pairs.
-     *    @return array        All pair objects.
-     *    @access public
-     */
-    function getAll() {
-        return $this->_request;
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part.
-     *    @return string        Part of URL.
-     *    @access protected
-     */
-    function _encode() {
-        $statements = array();
-        foreach ($this->_request as $pair) {
-            if ($statement = $pair->asRequest()) {
-                $statements[] = $statement;
-            }
-        }
-        return implode('&', $statements);
-    }
-}
-
-/**
- *    Bundle of GET parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleGetEncoding extends SimpleEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleGetEncoding($query = false) {
-        $this->SimpleEncoding($query);
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always GET.
-     *    @access public
-     */
-    function getMethod() {
-        return 'GET';
-    }
-
-    /**
-     *    Writes no extra headers.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-    }
-
-    /**
-     *    No data is sent to the socket as the data is encoded into
-     *    the URL.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part for attaching to a URL.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function asUrlRequest() {
-        return $this->_encode();
-    }
-}
-
-/**
- *    Bundle of URL parameters for a HEAD request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHeadEncoding extends SimpleGetEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleHeadEncoding($query = false) {
-        $this->SimpleGetEncoding($query);
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return 'HEAD';
-    }
-}
-
-/**
- *    Bundle of POST parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePostEncoding extends SimpleEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimplePostEncoding($query = false) {
-        if (is_array($query) and $this->hasMoreThanOneLevel($query)) {
-            $query = $this->rewriteArrayWithMultipleLevels($query);
-        }
-        $this->SimpleEncoding($query);
-    }
-
-    function hasMoreThanOneLevel($query) {
-        foreach ($query as $key => $value) {
-            if (is_array($value)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function rewriteArrayWithMultipleLevels($query) {
-        $query_ = array();
-        foreach ($query as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $sub_key => $sub_value) {
-                    $query_[$key."[".$sub_key."]"] = $sub_value;
-                }
-            } else {
-                $query_[$key] = $value;
-            }
-        }
-        if ($this->hasMoreThanOneLevel($query_)) {
-            $query_ = $this->rewriteArrayWithMultipleLevels($query_);
-        }
-
-        return $query_;
-    }
-
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always POST.
-     *    @access public
-     */
-    function getMethod() {
-        return 'POST';
-    }
-
-    /**
-     *    Dispatches the form headers down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-        $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
-        $socket->write("Content-Type: application/x-www-form-urlencoded\r\n");
-    }
-
-    /**
-     *    Dispatches the form data down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-        $socket->write($this->_encode());
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part for attaching to a URL.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function asUrlRequest() {
-        return '';
-    }
-}
-
-/**
- *    Bundle of POST parameters in the multipart
- *    format. Can include file uploads.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleMultipartEncoding extends SimplePostEncoding {
-    var $_boundary;
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleMultipartEncoding($query = false, $boundary = false) {
-        $this->SimplePostEncoding($query);
-        $this->_boundary = ($boundary === false ? uniqid('st') : $boundary);
-    }
-
-    /**
-     *    Dispatches the form headers down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-        $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
-        $socket->write("Content-Type: multipart/form-data, boundary=" . $this->_boundary . "\r\n");
-    }
-
-    /**
-     *    Dispatches the form data down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-        $socket->write($this->_encode());
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function _encode() {
-        $stream = '';
-        foreach ($this->_request as $pair) {
-            $stream .= "--" . $this->_boundary . "\r\n";
-            $stream .= $pair->asMime() . "\r\n";
-        }
-        $stream .= "--" . $this->_boundary . "--\r\n";
-        return $stream;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/errors.php b/tests/simpletest/errors.php
deleted file mode 100755
index bcf7a1b949..0000000000
--- a/tests/simpletest/errors.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: errors.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**
- * @ignore - PHP5 compatibility fix.
- */
-if (! defined('E_STRICT')) {
-    define('E_STRICT', 2048);
-}
-
-/**#@+
- * Includes SimpleTest files.
- */
-require_once dirname(__FILE__) . '/invoker.php';
-require_once dirname(__FILE__) . '/test_case.php';
-require_once dirname(__FILE__) . '/expectation.php';
-/**#@-*/
-
-/**
- *    Extension that traps errors into an error queue.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
-
-    /**
-     *    Stores the invoker to wrap.
-     *    @param SimpleInvoker $invoker  Test method runner.
-     */
-    function SimpleErrorTrappingInvoker(&$invoker) {
-        $this->SimpleInvokerDecorator($invoker);
-    }
-
-    /**
-     *    Invokes a test method and dispatches any
-     *    untrapped errors. Called back from
-     *    the visiting runner.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $queue = &$this->_createErrorQueue();
-        set_error_handler('SimpleTestErrorHandler');
-        parent::invoke($method);
-        restore_error_handler();
-        $queue->tally();
-    }
-
-    /**
-     *    Wires up the error queue for a single test.
-     *    @return SimpleErrorQueue    Queue connected to the test.
-     *    @access private
-     */
-    function &_createErrorQueue() {
-        $context = &SimpleTest::getContext();
-        $test = &$this->getTestCase();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->setTestCase($test);
-        return $queue;
-    }
-}
-
-/**
- *    Error queue used to record trapped
- *    errors.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleErrorQueue {
-    var $_queue;
-    var $_expectation_queue;
-    var $_test;
-    var $_using_expect_style = false;
-
-    /**
-     *    Starts with an empty queue.
-     */
-    function SimpleErrorQueue() {
-        $this->clear();
-    }
-
-    /**
-     *    Discards the contents of the error queue.
-     *    @access public
-     */
-    function clear() {
-        $this->_queue = array();
-        $this->_expectation_queue = array();
-    }
-
-    /**
-     *    Sets the currently running test case.
-     *    @param SimpleTestCase $test    Test case to send messages to.
-     *    @access public
-     */
-    function setTestCase(&$test) {
-        $this->_test = &$test;
-    }
-
-    /**
-     *    Sets up an expectation of an error. If this is
-     *    not fulfilled at the end of the test, a failure
-     *    will occour. If the error does happen, then this
-     *    will cancel it out and send a pass message.
-     *    @param SimpleExpectation $expected    Expected error match.
-     *    @param string $message                Message to display.
-     *    @access public
-     */
-    function expectError($expected, $message) {
-        $this->_using_expect_style = true;
-        array_push($this->_expectation_queue, array($expected, $message));
-    }
-
-    /**
-     *    Adds an error to the front of the queue.
-     *    @param integer $severity       PHP error code.
-     *    @param string $content         Text of error.
-     *    @param string $filename        File error occoured in.
-     *    @param integer $line           Line number of error.
-     *    @access public
-     */
-    function add($severity, $content, $filename, $line) {
-        $content = str_replace('%', '%%', $content);
-        if ($this->_using_expect_style) {
-            $this->_testLatestError($severity, $content, $filename, $line);
-        } else {
-            array_push(
-                    $this->_queue,
-                    array($severity, $content, $filename, $line));
-        }
-    }
-
-    /**
-     *    Any errors still in the queue are sent to the test
-     *    case. Any unfulfilled expectations trigger failures.
-     *    @access public
-     */
-    function tally() {
-        while (list($severity, $message, $file, $line) = $this->extract()) {
-            $severity = $this->getSeverityAsString($severity);
-            $this->_test->error($severity, $message, $file, $line);
-        }
-        while (list($expected, $message) = $this->_extractExpectation()) {
-            $this->_test->assert($expected, false, "%s -> Expected error not caught");
-        }
-    }
-
-    /**
-     *    Tests the error against the most recent expected
-     *    error.
-     *    @param integer $severity       PHP error code.
-     *    @param string $content         Text of error.
-     *    @param string $filename        File error occoured in.
-     *    @param integer $line           Line number of error.
-     *    @access private
-     */
-    function _testLatestError($severity, $content, $filename, $line) {
-        if ($expectation = $this->_extractExpectation()) {
-            list($expected, $message) = $expectation;
-            $this->_test->assert($expected, $content, sprintf(
-                    $message,
-                    "%s -> PHP error [$content] severity [" .
-                            $this->getSeverityAsString($severity) .
-                            "] in [$filename] line [$line]"));
-        } else {
-            $this->_test->error($severity, $content, $filename, $line);
-        }
-    }
-
-    /**
-     *    Pulls the earliest error from the queue.
-     *    @return  mixed    False if none, or a list of error
-     *                      information. Elements are: severity
-     *                      as the PHP error code, the error message,
-     *                      the file with the error, the line number
-     *                      and a list of PHP super global arrays.
-     *    @access public
-     */
-    function extract() {
-        if (count($this->_queue)) {
-            return array_shift($this->_queue);
-        }
-        return false;
-    }
-
-    /**
-     *    Pulls the earliest expectation from the queue.
-     *    @return     SimpleExpectation    False if none.
-     *    @access private
-     */
-    function _extractExpectation() {
-        if (count($this->_expectation_queue)) {
-            return array_shift($this->_expectation_queue);
-        }
-        return false;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoErrors($message) {
-        return $this->_test->assert(
-                new TrueExpectation(),
-                count($this->_queue) == 0,
-                sprintf($message, 'Should be no errors'));
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertError($expected, $message) {
-        if (count($this->_queue) == 0) {
-            $this->_test->fail(sprintf($message, 'Expected error not found'));
-            return false;
-        }
-        list($severity, $content, $file, $line) = $this->extract();
-        $severity = $this->getSeverityAsString($severity);
-        return $this->_test->assert(
-                $expected,
-                $content,
-                sprintf($message, "Expected PHP error [$content] severity [$severity] in [$file] line [$line]"));
-    }
-
-    /**
-     *    Converts an error code into it's string
-     *    representation.
-     *    @param $severity  PHP integer error code.
-     *    @return           String version of error code.
-     *    @access public
-     *    @static
-     */
-    function getSeverityAsString($severity) {
-        static $map = array(
-                E_STRICT => 'E_STRICT',
-                E_ERROR => 'E_ERROR',
-                E_WARNING => 'E_WARNING',
-                E_PARSE => 'E_PARSE',
-                E_NOTICE => 'E_NOTICE',
-                E_CORE_ERROR => 'E_CORE_ERROR',
-                E_CORE_WARNING => 'E_CORE_WARNING',
-                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-                E_USER_ERROR => 'E_USER_ERROR',
-                E_USER_WARNING => 'E_USER_WARNING',
-                E_USER_NOTICE => 'E_USER_NOTICE');
-        if (defined('E_RECOVERABLE_ERROR')) {
-            $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
-        }
-        if (defined('E_DEPRECATED')) {
-            $map[E_DEPRECATED] = 'E_DEPRECATED';
-        }
-        return $map[$severity];
-    }
-}
-
-/**
- *    Error handler that simply stashes any errors into the global
- *    error queue. Simulates the existing behaviour with respect to
- *    logging errors, but this feature may be removed in future.
- *    @param $severity        PHP error code.
- *    @param $message         Text of error.
- *    @param $filename        File error occoured in.
- *    @param $line            Line number of error.
- *    @param $super_globals   Hash of PHP super global arrays.
- *    @static
- *    @access public
- */
-function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
-    $severity = $severity & error_reporting();
-    if ($severity) {
-        restore_error_handler();
-        if (ini_get('log_errors')) {
-            $label = SimpleErrorQueue::getSeverityAsString($severity);
-            error_log("$label: $message in $filename on line $line");
-        }
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->add($severity, $message, $filename, $line);
-        set_error_handler('SimpleTestErrorHandler');
-    }
-    return true;
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/exceptions.php b/tests/simpletest/exceptions.php
deleted file mode 100755
index 12bba8a172..0000000000
--- a/tests/simpletest/exceptions.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: exceptions.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- * Include required SimpleTest files
- */
-require_once dirname(__FILE__) . '/invoker.php';
-require_once dirname(__FILE__) . '/expectation.php';
-/**#@-*/
-
-/**
- *    Extension that traps exceptions and turns them into
- *    an error message. PHP5 only.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
-
-    /**
-     *    Stores the invoker to be wrapped.
-     *    @param SimpleInvoker $invoker   Test method runner.
-     */
-    function SimpleExceptionTrappingInvoker($invoker) {
-        $this->SimpleInvokerDecorator($invoker);
-    }
-
-    /**
-     *    Invokes a test method whilst trapping expected
-     *    exceptions. Any left over unthrown exceptions
-     *    are then reported as failures.
-     *    @param string $method    Test method to call.
-     */
-    function invoke($method) {
-        $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
-        $trap->clear();
-        try {
-            $has_thrown = false;
-            parent::invoke($method);
-        } catch (Exception $exception) {
-            $has_thrown = true;
-            if (! $trap->isExpected($this->getTestCase(), $exception)) {
-                $this->getTestCase()->exception($exception);
-            }
-            $trap->clear();
-        }
-        if ($message = $trap->getOutstanding()) {
-            $this->getTestCase()->fail($message);
-        }
-        if ($has_thrown) {
-            try {
-                parent::getTestCase()->tearDown();
-            } catch (Exception $e) { }
-        }
-    }
-}
-
-/**
- *    Tests exceptions either by type or the exact
- *    exception. This could be improved to accept
- *    a pattern expectation to test the error
- *    message, but that will have to come later.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ExceptionExpectation extends SimpleExpectation {
-    private $expected;
-
-    /**
-     *    Sets up the conditions to test against.
-     *    If the expected value is a string, then
-     *    it will act as a test of the class name.
-     *    An exception as the comparison will
-     *    trigger an identical match. Writing this
-     *    down now makes it look doubly dumb. I hope
-     *    come up with a better scheme later.
-     *    @param mixed $expected   A class name or an actual
-     *                             exception to compare with.
-     *    @param string $message   Message to display.
-     */
-    function __construct($expected, $message = '%s') {
-        $this->expected = $expected;
-        parent::__construct($message);
-    }
-
-    /**
-     *    Carry out the test.
-     *    @param Exception $compare    Value to check.
-     *    @return boolean              True if matched.
-     */
-    function test($compare) {
-        if (is_string($this->expected)) {
-            return ($compare instanceof $this->expected);
-        }
-        if (get_class($compare) != get_class($this->expected)) {
-            return false;
-        }
-        return $compare->getMessage() == $this->expected->getMessage();
-    }
-
-    /**
-     *    Create the message to display describing the test.
-     *    @param Exception $compare     Exception to match.
-     *    @return string                Final message.
-     */
-    function testMessage($compare) {
-        if (is_string($this->expected)) {
-            return "Exception [" . $this->describeException($compare) .
-                    "] should be type [" . $this->expected . "]";
-        }
-        return "Exception [" . $this->describeException($compare) .
-                "] should match [" .
-                $this->describeException($this->expected) . "]";
-    }
-
-    /**
-     *    Summary of an Exception object.
-     *    @param Exception $compare     Exception to describe.
-     *    @return string                Text description.
-     */
-    protected function describeException($exception) {
-        return get_class($exception) . ": " . $exception->getMessage();
-    }
-}
-
-/**
- *    Stores expected exceptions for when they
- *    get thrown. Saves the irritating try...catch
- *    block.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleExceptionTrap {
-    private $expected;
-    private $message;
-
-    /**
-     *    Clears down the queue ready for action.
-     */
-    function __construct() {
-        $this->clear();
-    }
-
-    /**
-     *    Sets up an expectation of an exception.
-     *    This has the effect of intercepting an
-     *    exception that matches.
-     *    @param SimpleExpectation $expected    Expected exception to match.
-     *    @param string $message                Message to display.
-     *    @access public
-     */
-    function expectException($expected = false, $message = '%s') {
-        if ($expected === false) {
-            $expected = new AnythingExpectation();
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new ExceptionExpectation($expected);
-        }
-        $this->expected = $expected;
-        $this->message = $message;
-    }
-
-    /**
-     *    Compares the expected exception with any
-     *    in the queue. Issues a pass or fail and
-     *    returns the state of the test.
-     *    @param SimpleTestCase $test    Test case to send messages to.
-     *    @param Exception $exception    Exception to compare.
-     *    @return boolean                False on no match.
-     */
-    function isExpected($test, $exception) {
-        if ($this->expected) {
-            return $test->assert($this->expected, $exception, $this->message);
-        }
-        return false;
-    }
-
-    /**
-     *    Tests for any left over exception.
-     *    @return string/false     The failure message or false if none.
-     */
-    function getOutstanding() {
-        return sprintf($this->message, 'Failed to trap exception');
-    }
-
-    /**
-     *    Discards the contents of the error queue.
-     */
-    function clear() {
-        $this->expected = false;
-        $this->message = false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/expectation.php b/tests/simpletest/expectation.php
deleted file mode 100755
index 194afd5c74..0000000000
--- a/tests/simpletest/expectation.php
+++ /dev/null
@@ -1,895 +0,0 @@
-<?php
-/**
- *    base include file for SimpleTest
- *    @package    SimpleTest
- *    @subpackage    UnitTester
- *    @version    $Id: expectation.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *    include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Assertion that can display failure information.
- *    Also includes various helper methods.
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @abstract
- */
-class SimpleExpectation {
-    var $_dumper = false;
-    var $_message;
-
-    /**
-     *    Creates a dumper for displaying values and sets
-     *    the test message.
-     *    @param string $message    Customised message on failure.
-     */
-    function SimpleExpectation($message = '%s') {
-        $this->_message = $message;
-    }
-
-    /**
-     *    Tests the expectation. True if correct.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     *    @abstract
-     */
-    function test($compare) {
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     *    @abstract
-     */
-    function testMessage($compare) {
-    }
-
-    /**
-     *    Overlays the generated message onto the stored user
-     *    message. An additional message can be interjected.
-     *    @param mixed $compare        Comparison value.
-     *    @param SimpleDumper $dumper  For formatting the results.
-     *    @return string               Description of success
-     *                                 or failure.
-     *    @access public
-     */
-    function overlayMessage($compare, $dumper) {
-        $this->_dumper = $dumper;
-        return sprintf($this->_message, $this->testMessage($compare));
-    }
-
-    /**
-     *    Accessor for the dumper.
-     *    @return SimpleDumper    Current value dumper.
-     *    @access protected
-     */
-    function &_getDumper() {
-        if (! $this->_dumper) {
-            $dumper = &new SimpleDumper();
-            return $dumper;
-        }
-        return $this->_dumper;
-    }
-
-    /**
-     *    Test to see if a value is an expectation object.
-     *    A useful utility method.
-     *    @param mixed $expectation    Hopefully an Epectation
-     *                                 class.
-     *    @return boolean              True if descended from
-     *                                 this class.
-     *    @access public
-     *    @static
-     */
-    function isExpectation($expectation) {
-        return is_object($expectation) &&
-                SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
-    }
-}
-
-/**
- *    A wildcard expectation always matches.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class AnythingExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation. Always true.
-     *    @param mixed $compare  Ignored.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function test($compare) {
-        return true;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Anything always matches [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that never matches.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class FailedExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation. Always false.
-     *    @param mixed $compare  Ignored.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function test($compare) {
-        return false;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Failed expectation never matches [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that passes on boolean true.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class TrueExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation.
-     *    @param mixed $compare  Should be true.
-     *    @return boolean        True on match.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)$compare;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Expected true, got [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that passes on boolean false.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class FalseExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation.
-     *    @param mixed $compare  Should be false.
-     *    @return boolean        True on match.
-     *    @access public
-     */
-    function test($compare) {
-        return ! (boolean)$compare;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Expected false, got [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    Test for equality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class EqualExpectation extends SimpleExpectation {
-    var $_value;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value        Test value to match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function EqualExpectation($value, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_value = $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (($this->_value == $compare) && ($compare == $this->_value));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return "Equal expectation [" . $this->_dumper->describeValue($this->_value) . "]";
-        } else {
-            return "Equal expectation fails " .
-                    $this->_dumper->describeDifference($this->_value, $compare);
-        }
-    }
-
-    /**
-     *    Accessor for comparison value.
-     *    @return mixed       Held value to compare with.
-     *    @access protected
-     */
-    function _getValue() {
-        return $this->_value;
-    }
-}
-
-/**
- *    Test for inequality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NotEqualExpectation extends EqualExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value       Test value to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NotEqualExpectation($value, $message = '%s') {
-        $this->EqualExpectation($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it differs from the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if ($this->test($compare)) {
-            return "Not equal expectation passes " .
-                    $dumper->describeDifference($this->_getValue(), $compare);
-        } else {
-            return "Not equal expectation fails [" .
-                    $dumper->describeValue($this->_getValue()) .
-                    "] matches";
-        }
-    }
-}
-
-/**
- *    Test for being within a range.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class WithinMarginExpectation extends SimpleExpectation {
-    var $_upper;
-    var $_lower;
-
-    /**
-     *    Sets the value to compare against and the fuzziness of
-     *    the match. Used for comparing floating point values.
-     *    @param mixed $value        Test value to match.
-     *    @param mixed $margin       Fuzziness of match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function WithinMarginExpectation($value, $margin, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_upper = $value + $margin;
-        $this->_lower = $value - $margin;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (($compare <= $this->_upper) && ($compare >= $this->_lower));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->_withinMessage($compare);
-        } else {
-            return $this->_outsideMessage($compare);
-        }
-    }
-
-    /**
-     *    Creates a the message for being within the range.
-     *    @param mixed $compare        Value being tested.
-     *    @access private
-     */
-    function _withinMessage($compare) {
-        return "Within expectation [" . $this->_dumper->describeValue($this->_lower) . "] and [" .
-                $this->_dumper->describeValue($this->_upper) . "]";
-    }
-
-    /**
-     *    Creates a the message for being within the range.
-     *    @param mixed $compare        Value being tested.
-     *    @access private
-     */
-    function _outsideMessage($compare) {
-        if ($compare > $this->_upper) {
-            return "Outside expectation " .
-                    $this->_dumper->describeDifference($compare, $this->_upper);
-        } else {
-            return "Outside expectation " .
-                    $this->_dumper->describeDifference($compare, $this->_lower);
-        }
-    }
-}
-
-/**
- *    Test for being outside of a range.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class OutsideMarginExpectation extends WithinMarginExpectation {
-
-    /**
-     *    Sets the value to compare against and the fuzziness of
-     *    the match. Used for comparing floating point values.
-     *    @param mixed $value        Test value to not match.
-     *    @param mixed $margin       Fuzziness of match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function OutsideMarginExpectation($value, $margin, $message = '%s') {
-        $this->WithinMarginExpectation($value, $margin, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if (! $this->test($compare)) {
-            return $this->_withinMessage($compare);
-        } else {
-            return $this->_outsideMessage($compare);
-        }
-    }
-}
-
-/**
- *    Test for reference.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ReferenceExpectation extends SimpleExpectation {
-    var $_value;
-
-    /**
-     *    Sets the reference value to compare against.
-     *    @param mixed $value       Test reference to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function ReferenceExpectation(&$value, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_value =& $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it exactly
-     *    references the held value.
-     *    @param mixed $compare        Comparison reference.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test(&$compare) {
-        return SimpleTestCompatibility::isReference($this->_value, $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return "Reference expectation [" . $this->_dumper->describeValue($this->_value) . "]";
-        } else {
-            return "Reference expectation fails " .
-                    $this->_dumper->describeDifference($this->_value, $compare);
-        }
-    }
-
-    function _getValue() {
-        return $this->_value;
-    }
-}
-
-/**
- *    Test for identity.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class IdenticalExpectation extends EqualExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value       Test value to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function IdenticalExpectation($value, $message = '%s') {
-        $this->EqualExpectation($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it exactly
-     *    matches the held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return SimpleTestCompatibility::isIdentical($this->_getValue(), $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if ($this->test($compare)) {
-            return "Identical expectation [" . $dumper->describeValue($this->_getValue()) . "]";
-        } else {
-            return "Identical expectation [" . $dumper->describeValue($this->_getValue()) .
-                    "] fails with [" .
-                    $dumper->describeValue($compare) . "] " .
-                    $dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
-        }
-    }
-}
-
-/**
- *    Test for non-identity.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NotIdenticalExpectation extends IdenticalExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value        Test value to match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function NotIdenticalExpectation($value, $message = '%s') {
-        $this->IdenticalExpectation($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it differs from the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if ($this->test($compare)) {
-            return "Not identical expectation passes " .
-                    $dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
-        } else {
-            return "Not identical expectation [" . $dumper->describeValue($this->_getValue()) . "] matches";
-        }
-    }
-}
-
-/**
- *    Test for a pattern using Perl regex rules.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class PatternExpectation extends SimpleExpectation {
-    var $_pattern;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $pattern    Pattern to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function PatternExpectation($pattern, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_pattern = $pattern;
-    }
-
-    /**
-     *    Accessor for the pattern.
-     *    @return string       Perl regex as string.
-     *    @access protected
-     */
-    function _getPattern() {
-        return $this->_pattern;
-    }
-
-    /**
-     *    Tests the expectation. True if the Perl regex
-     *    matches the comparison value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)preg_match($this->_getPattern(), $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->_describePatternMatch($this->_getPattern(), $compare);
-        } else {
-            $dumper = &$this->_getDumper();
-            return "Pattern [" . $this->_getPattern() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        }
-    }
-
-    /**
-     *    Describes a pattern match including the string
-     *    found and it's position.
-     *    @param string $pattern        Regex to match against.
-     *    @param string $subject        Subject to search.
-     *    @access protected
-     */
-    function _describePatternMatch($pattern, $subject) {
-        preg_match($pattern, $subject, $matches);
-        $position = strpos($subject, $matches[0]);
-        $dumper = $this->_getDumper();
-        return "Pattern [$pattern] detected at character [$position] in [" .
-                $dumper->describeValue($subject) . "] as [" .
-                $matches[0] . "] in region [" .
-                $dumper->clipString($subject, 100, $position) . "]";
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @deprecated
- */
-class WantedPatternExpectation extends PatternExpectation {
-}
-
-/**
- *    Fail if a pattern is detected within the
- *    comparison.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoPatternExpectation extends PatternExpectation {
-
-    /**
-     *    Sets the reject pattern
-     *    @param string $pattern    Pattern to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NoPatternExpectation($pattern, $message = '%s') {
-        $this->PatternExpectation($pattern, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the Perl regex
-     *    matches the comparison value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param string $compare      Comparison value.
-     *    @return string              Description of success
-     *                                or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            $dumper = &$this->_getDumper();
-            return "Pattern [" . $this->_getPattern() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        } else {
-            return $this->_describePatternMatch($this->_getPattern(), $compare);
-        }
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage UnitTester
- *      @deprecated
- */
-class UnwantedPatternExpectation extends NoPatternExpectation {
-}
-
-/**
- *    Tests either type or class name if it's an object.
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class IsAExpectation extends SimpleExpectation {
-    var $_type;
-
-    /**
-     *    Sets the type to compare with.
-     *    @param string $type       Type or class name.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function IsAExpectation($type, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_type = $type;
-    }
-
-    /**
-     *    Accessor for type to check against.
-     *    @return string    Type or class name.
-     *    @access protected
-     */
-    function _getType() {
-        return $this->_type;
-    }
-
-    /**
-     *    Tests the expectation. True if the type or
-     *    class matches the string value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        if (is_object($compare)) {
-            return SimpleTestCompatibility::isA($compare, $this->_type);
-        } else {
-            return (strtolower(gettype($compare)) == $this->_canonicalType($this->_type));
-        }
-    }
-
-    /**
-     *    Coerces type name into a gettype() match.
-     *    @param string $type        User type.
-     *    @return string             Simpler type.
-     *    @access private
-     */
-    function _canonicalType($type) {
-        $type = strtolower($type);
-        $map = array(
-                'bool' => 'boolean',
-                'float' => 'double',
-                'real' => 'double',
-                'int' => 'integer');
-        if (isset($map[$type])) {
-            $type = $map[$type];
-        }
-        return $type;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return "Value [" . $dumper->describeValue($compare) .
-                "] should be type [" . $this->_type . "]";
-    }
-}
-
-/**
- *    Tests either type or class name if it's an object.
- *    Will succeed if the type does not match.
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class NotAExpectation extends IsAExpectation {
-    var $_type;
-
-    /**
-     *    Sets the type to compare with.
-     *    @param string $type       Type or class name.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NotAExpectation($type, $message = '%s') {
-        $this->IsAExpectation($type, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the type or
-     *    class matches the string value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if different.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return "Value [" . $dumper->describeValue($compare) .
-                "] should not be type [" . $this->_getType() . "]";
-    }
-}
-
-/**
- *    Tests for existance of a method in an object
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class MethodExistsExpectation extends SimpleExpectation {
-    var $_method;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $method     Method to check.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     *    @return void
-     */
-    function MethodExistsExpectation($method, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_method = &$method;
-    }
-
-    /**
-     *    Tests the expectation. True if the method exists in the test object.
-     *    @param string $compare        Comparison method name.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)(is_object($compare) && method_exists($compare, $this->_method));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if (! is_object($compare)) {
-            return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
-        }
-        $method = $this->_method;
-        return "Object [" . $dumper->describeValue($compare) .
-                "] should contain method [$method]";
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/extensions/index.html b/tests/simpletest/extensions/index.html
deleted file mode 100755
index 8e464d8ce3..0000000000
--- a/tests/simpletest/extensions/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-</head>
-<body>
-<br />
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/simpletest/extensions/pear_test_case.php b/tests/simpletest/extensions/pear_test_case.php
deleted file mode 100755
index a28978000a..0000000000
--- a/tests/simpletest/extensions/pear_test_case.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-    /**
-     *	adapter for SimpleTest to use PEAR PHPUnit test cases
-     *	@package	SimpleTest
-     *	@subpackage Extensions
-     *	@version	$Id: pear_test_case.php 1388 2006-11-10 20:59:59Z lastcraft $
-     */
-
-    /**#@+
-     * include SimpleTest files
-     */
-    require_once(dirname(__FILE__) . '/../dumper.php');
-    require_once(dirname(__FILE__) . '/../compatibility.php');
-    require_once(dirname(__FILE__) . '/../test_case.php');
-    require_once(dirname(__FILE__) . '/../expectation.php');
-	/**#@-*/
-
-    /**
-     *    Adapter for PEAR PHPUnit test case to allow
-     *    legacy PEAR test cases to be used with SimpleTest.
-     *    @package      SimpleTest
-     *    @subpackage   Extensions
-     */
-    class PHPUnit_TestCase extends SimpleTestCase {
-        var $_loosely_typed;
-
-        /**
-         *    Constructor. Sets the test name.
-         *    @param $label        Test name to display.
-         *    @public
-         */
-        function PHPUnit_TestCase($label = false) {
-            $this->SimpleTestCase($label);
-            $this->_loosely_typed = false;
-        }
-
-        /**
-         *    Will test straight equality if set to loose
-         *    typing, or identity if not.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEquals($first, $second, $message = "%s", $delta = 0) {
-            if ($this->_loosely_typed) {
-                $expectation = &new EqualExpectation($first);
-            } else {
-                $expectation = &new IdenticalExpectation($first);
-            }
-            $this->assert($expectation, $second, $message);
-        }
-
-        /**
-         *    Passes if the value tested is not null.
-         *    @param $value          Value to test against.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNotNull($value, $message = "%s") {
-            parent::assert(new TrueExpectation(), isset($value), $message);
-        }
-
-        /**
-         *    Passes if the value tested is null.
-         *    @param $value          Value to test against.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNull($value, $message = "%s") {
-            parent::assert(new TrueExpectation(), !isset($value), $message);
-        }
-
-        /**
-         *    In PHP5 the identity test tests for the same
-         *    object. This is a reference test in PHP4.
-         *    @param $first          First object handle.
-         *    @param $second         Hopefully the same handle.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertSame(&$first, &$second, $message = "%s") {
-            $dumper = &new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should reference the same object");
-            return $this->assert(
-					new TrueExpectation(),
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
-
-        /**
-         *    In PHP5 the identity test tests for the same
-         *    object. This is a reference test in PHP4.
-         *    @param $first          First object handle.
-         *    @param $second         Hopefully a different handle.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNotSame(&$first, &$second, $message = "%s") {
-            $dumper = &new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should not be the same object");
-            return $this->assert(
-					new falseExpectation(),
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
-
-        /**
-         *    Sends pass if the test condition resolves true,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test true.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertTrue($condition, $message = "%s") {
-            parent::assert(new TrueExpectation(), $condition, $message);
-        }
-
-        /**
-         *    Sends pass if the test condition resolves false,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test false.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertFalse($condition, $message = "%s") {
-            parent::assert(new FalseExpectation(), $condition, $message);
-        }
-
-        /**
-         *    Tests a regex match. Needs refactoring.
-         *    @param $pattern        Regex to match.
-         *    @param $subject        String to search in.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertRegExp($pattern, $subject, $message = "%s") {
-            $this->assert(new PatternExpectation($pattern), $subject, $message);
-        }
-
-        /**
-         *    Tests the type of a value.
-         *    @param $value          Value to take type of.
-         *    @param $type           Hoped for type.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertType($value, $type, $message = "%s") {
-            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
-        }
-
-        /**
-         *    Sets equality operation to act as a simple equal
-         *    comparison only, allowing a broader range of
-         *    matches.
-         *    @param $loosely_typed     True for broader comparison.
-         *    @public
-         */
-        function setLooselyTyped($loosely_typed) {
-            $this->_loosely_typed = $loosely_typed;
-        }
-
-        /**
-         *    For progress indication during
-         *    a test amongst other things.
-         *    @return            Usually one.
-         *    @public
-         */
-        function countTestCases() {
-            return $this->getSize();
-        }
-
-        /**
-         *    Accessor for name, normally just the class
-         *    name.
-         *    @public
-         */
-        function getName() {
-            return $this->getLabel();
-        }
-
-        /**
-         *    Does nothing. For compatibility only.
-         *    @param $name        Dummy
-         *    @public
-         */
-        function setName($name) {
-        }
-    }
-?>
diff --git a/tests/simpletest/extensions/phpunit_test_case.php b/tests/simpletest/extensions/phpunit_test_case.php
deleted file mode 100755
index 4e563e16a7..0000000000
--- a/tests/simpletest/extensions/phpunit_test_case.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-    /**
-     *	adapter for SimpleTest to use PHPUnit test cases
-     *	@package	SimpleTest
-     *	@subpackage Extensions
-     *	@version	$Id: phpunit_test_case.php 1530 2007-06-04 23:35:45Z lastcraft $
-     */
-
-    /**#@+
-     * include SimpleTest files
-     */
-    require_once(dirname(__FILE__) . '/../unit_tester.php');
-    require_once(dirname(__FILE__) . '/../expectation.php');
-    /**#@-*/
-
-    /**
-     *    Adapter for sourceforge PHPUnit test case to allow
-     *    legacy test cases to be used with SimpleTest.
-     *    @package		SimpleTest
-     *    @subpackage	Extensions
-     */
-    class TestCase extends SimpleTestCase {
-
-        /**
-         *    Constructor. Sets the test name.
-         *    @param $label        Test name to display.
-         *    @public
-         */
-        function TestCase($label = false) {
-            $this->SimpleTestCase($label);
-        }
-
-        /**
-         *    Sends pass if the test condition resolves true,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test true.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assert($condition, $message = false) {
-            parent::assert(new TrueExpectation(), $condition, $message);
-        }
-
-        /**
-         *    Will test straight equality if set to loose
-         *    typing, or identity if not.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEquals($first, $second, $message = false) {
-            parent::assert(new EqualExpectation($first), $second, $message);
-        }
-
-        /**
-         *    Simple string equality.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEqualsMultilineStrings($first, $second, $message = false) {
-            parent::assert(new EqualExpectation($first), $second, $message);
-        }
-
-        /**
-         *    Tests a regex match.
-         *    @param $pattern        Regex to match.
-         *    @param $subject        String to search in.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertRegexp($pattern, $subject, $message = false) {
-            parent::assert(new PatternExpectation($pattern), $subject, $message);
-        }
-
-        /**
-         *    Sends an error which we interpret as a fail
-         *    with a different message for compatibility.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function error($message) {
-            parent::fail("Error triggered [$message]");
-        }
-
-        /**
-         *    Accessor for name.
-         *    @public
-         */
-       function name() {
-            return $this->getLabel();
-        }
-    }
-?>
diff --git a/tests/simpletest/extensions/testdox.php b/tests/simpletest/extensions/testdox.php
deleted file mode 100755
index 7db7c872c2..0000000000
--- a/tests/simpletest/extensions/testdox.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-class TestDoxReporter extends SimpleReporter
-{
-    var $_test_case_pattern = '/^TestOf(.*)$/';
-
-    function TestDoxReporter($test_case_pattern = '/^TestOf(.*)$/') {
-        parent::SimpleScorer();
-        $this->_test_case_pattern = empty($test_case_pattern) ? '/^(.*)$/' : $test_case_pattern;
-    }
-
-    function paintCaseStart($test_name) {
-        preg_match($this->_test_case_pattern, $test_name, $matches);
-        if (!empty($matches[1])) {
-            echo $matches[1] . "\n";
-        } else {
-            echo $test_name . "\n";
-        }
-    }
-
-    function paintCaseEnd() {
-        echo "\n";
-    }
-
-    function paintMethodStart($test_name) {
-        if (!preg_match('/^test(.*)$/i', $test_name, $matches)) {
-            return;
-        }
-        $test_name = $matches[1];
-
-        $test_name = preg_replace('/([A-Z])([A-Z])/', '$1 $2', $test_name);
-        echo '- ' . strtolower(preg_replace('/([a-zA-Z])([A-Z0-9])/', '$1 $2', $test_name));
-    }
-
-    function paintMethodEnd() {
-        echo "\n";
-    }
-
-    function paintFail() {
-        echo " [FAILED]";
-    }
-}
diff --git a/tests/simpletest/extensions/testdox/index.html b/tests/simpletest/extensions/testdox/index.html
deleted file mode 100755
index 8e464d8ce3..0000000000
--- a/tests/simpletest/extensions/testdox/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-</head>
-<body>
-<br />
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/simpletest/extensions/testdox/test.php b/tests/simpletest/extensions/testdox/test.php
deleted file mode 100755
index 82c5b7da86..0000000000
--- a/tests/simpletest/extensions/testdox/test.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-// $Id: test.php 1641 2008-01-22 20:13:52Z pp11 $
-require_once dirname(__FILE__) . '/../../autorun.php';
-require_once dirname(__FILE__) . '/../testdox.php';
-
-// uncomment to see test dox in action
-//SimpleTest::prefer(new TestDoxReporter());
-
-class TestOfTestDoxReporter extends UnitTestCase
-{
-    function testIsAnInstanceOfSimpleScorerAndReporter() {
-        $dox = new TestDoxReporter();
-        $this->assertIsA($dox, 'SimpleScorer');
-        $this->assertIsA($dox, 'SimpleReporter');
-    }
-
-    function testOutputsNameOfTestCase() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintCaseStart('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertWantedPattern('/^TestDoxReporter/', $buffer);
-    }
-
-    function testOutputOfTestCaseNameFilteredByConstructParameter() {
-        $dox = new TestDoxReporter('/^(.*)Test$/');
-        ob_start();
-        $dox->paintCaseStart('SomeGreatWidgetTest');
-        $buffer = ob_get_clean();
-        $this->assertWantedPattern('/^SomeGreatWidget/', $buffer);
-    }
-
-    function testIfTest_case_patternIsEmptyAssumeEverythingMatches() {
-        $dox = new TestDoxReporter('');
-        ob_start();
-        $dox->paintCaseStart('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertWantedPattern('/^TestOfTestDoxReporter/', $buffer);
-    }
-
-    function testEmptyLineInsertedWhenCaseEnds() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintCaseEnd('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertEqual("\n", $buffer);
-    }
-
-    function testPaintsTestMethodInTestDoxFormat() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('testSomeGreatTestCase');
-        $buffer = ob_get_clean();
-        $this->assertEqual("- some great test case", $buffer);
-        unset($buffer);
-
-        $random = rand(100, 200);
-        ob_start();
-        $dox->paintMethodStart("testRandomNumberIs{$random}");
-        $buffer = ob_get_clean();
-        $this->assertEqual("- random number is {$random}", $buffer);
-    }
-
-    function testDoesNotOutputAnythingOnNoneTestMethods() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('nonMatchingMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual('', $buffer);
-    }
-
-    function testPaintMethodAddLineBreak() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodEnd('someMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual("\n", $buffer);
-        $this->assertNoErrors();
-    }
-
-    function testProperlySpacesSingleLettersInMethodName() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('testAVerySimpleAgainAVerySimpleMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual('- a very simple again a very simple method', $buffer);
-    }
-
-    function testOnFailureThisPrintsFailureNotice() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintFail();
-        $buffer = ob_get_clean();
-        $this->assertEqual(' [FAILED]', $buffer);
-    }
-
-    function testWhenMatchingMethodNamesTestPrefixIsCaseInsensitive() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('TESTSupportsAllUppercaseTestPrefixEvenThoughIDoNotKnowWhyYouWouldDoThat');
-        $buffer = ob_get_clean();
-        $this->assertEqual(
-            '- supports all uppercase test prefix even though i do not know why you would do that',
-            $buffer
-        );
-    }
-}
-
diff --git a/tests/simpletest/form.php b/tests/simpletest/form.php
deleted file mode 100755
index 1dd42b353a..0000000000
--- a/tests/simpletest/form.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: form.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/selector.php');
-/**#@-*/
-
-/**
- *    Form tag class to hold widget values.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleForm {
-    var $_method;
-    var $_action;
-    var $_encoding;
-    var $_default_target;
-    var $_id;
-    var $_buttons;
-    var $_images;
-    var $_widgets;
-    var $_radios;
-    var $_checkboxes;
-
-    /**
-     *    Starts with no held controls/widgets.
-     *    @param SimpleTag $tag        Form tag to read.
-     *    @param SimplePage $page      Holding page.
-     */
-    function SimpleForm($tag, &$page) {
-        $this->_method = $tag->getAttribute('method');
-        $this->_action = $this->_createAction($tag->getAttribute('action'), $page);
-        $this->_encoding = $this->_setEncodingClass($tag);
-        $this->_default_target = false;
-        $this->_id = $tag->getAttribute('id');
-        $this->_buttons = array();
-        $this->_images = array();
-        $this->_widgets = array();
-        $this->_radios = array();
-        $this->_checkboxes = array();
-    }
-
-    /**
-     *    Creates the request packet to be sent by the form.
-     *    @param SimpleTag $tag        Form tag to read.
-     *    @return string               Packet class.
-     *    @access private
-     */
-    function _setEncodingClass($tag) {
-        if (strtolower($tag->getAttribute('method')) == 'post') {
-            if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
-                return 'SimpleMultipartEncoding';
-            }
-            return 'SimplePostEncoding';
-        }
-        return 'SimpleGetEncoding';
-    }
-
-    /**
-     *    Sets the frame target within a frameset.
-     *    @param string $frame        Name of frame.
-     *    @access public
-     */
-    function setDefaultTarget($frame) {
-        $this->_default_target = $frame;
-    }
-
-    /**
-     *    Accessor for method of form submission.
-     *    @return string           Either get or post.
-     *    @access public
-     */
-    function getMethod() {
-        return ($this->_method ? strtolower($this->_method) : 'get');
-    }
-
-    /**
-     *    Combined action attribute with current location
-     *    to get an absolute form target.
-     *    @param string $action    Action attribute from form tag.
-     *    @param SimpleUrl $base   Page location.
-     *    @return SimpleUrl        Absolute form target.
-     */
-    function _createAction($action, &$page) {
-        if (($action === '') || ($action === false)) {
-            return $page->expandUrl($page->getUrl());
-        }
-        return $page->expandUrl(new SimpleUrl($action));;
-    }
-
-    /**
-     *    Absolute URL of the target.
-     *    @return SimpleUrl           URL target.
-     *    @access public
-     */
-    function getAction() {
-        $url = $this->_action;
-        if ($this->_default_target && ! $url->getTarget()) {
-            $url->setTarget($this->_default_target);
-        }
-        return $url;
-    }
-
-    /**
-     *    Creates the encoding for the current values in the
-     *    form.
-     *    @return SimpleFormEncoding    Request to submit.
-     *    @access private
-     */
-    function _encode() {
-        $class = $this->_encoding;
-        $encoding = new $class();
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            $this->_widgets[$i]->write($encoding);
-        }
-        return $encoding;
-    }
-
-    /**
-     *    ID field of form for unique identification.
-     *    @return string           Unique tag ID.
-     *    @access public
-     */
-    function getId() {
-        return $this->_id;
-    }
-
-    /**
-     *    Adds a tag contents to the form.
-     *    @param SimpleWidget $tag        Input tag to add.
-     *    @access public
-     */
-    function addWidget(&$tag) {
-        if (strtolower($tag->getAttribute('type')) == 'submit') {
-            $this->_buttons[] = &$tag;
-        } elseif (strtolower($tag->getAttribute('type')) == 'image') {
-            $this->_images[] = &$tag;
-        } elseif ($tag->getName()) {
-            $this->_setWidget($tag);
-        }
-    }
-
-    /**
-     *    Sets the widget into the form, grouping radio
-     *    buttons if any.
-     *    @param SimpleWidget $tag   Incoming form control.
-     *    @access private
-     */
-    function _setWidget(&$tag) {
-        if (strtolower($tag->getAttribute('type')) == 'radio') {
-            $this->_addRadioButton($tag);
-        } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
-            $this->_addCheckbox($tag);
-        } else {
-            $this->_widgets[] = &$tag;
-        }
-    }
-
-    /**
-     *    Adds a radio button, building a group if necessary.
-     *    @param SimpleRadioButtonTag $tag   Incoming form control.
-     *    @access private
-     */
-    function _addRadioButton(&$tag) {
-        if (! isset($this->_radios[$tag->getName()])) {
-            $this->_widgets[] = &new SimpleRadioGroup();
-            $this->_radios[$tag->getName()] = count($this->_widgets) - 1;
-        }
-        $this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
-    }
-
-    /**
-     *    Adds a checkbox, making it a group on a repeated name.
-     *    @param SimpleCheckboxTag $tag   Incoming form control.
-     *    @access private
-     */
-    function _addCheckbox(&$tag) {
-        if (! isset($this->_checkboxes[$tag->getName()])) {
-            $this->_widgets[] = &$tag;
-            $this->_checkboxes[$tag->getName()] = count($this->_widgets) - 1;
-        } else {
-            $index = $this->_checkboxes[$tag->getName()];
-            if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
-                $previous = &$this->_widgets[$index];
-                $this->_widgets[$index] = &new SimpleCheckboxGroup();
-                $this->_widgets[$index]->addWidget($previous);
-            }
-            $this->_widgets[$index]->addWidget($tag);
-        }
-    }
-
-    /**
-     *    Extracts current value from form.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return string/array              Value(s) as string or null
-     *                                      if not set.
-     *    @access public
-     */
-    function getValue($selector) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->_widgets[$i])) {
-                return $this->_widgets[$i]->getValue();
-            }
-        }
-        foreach ($this->_buttons as $button) {
-            if ($selector->isMatch($button)) {
-                return $button->getValue();
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Sets a widget value within the form.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param string $value              Value to input into the widget.
-     *    @return boolean                   True if value is legal, false
-     *                                      otherwise. If the field is not
-     *                                      present, nothing will be set.
-     *    @access public
-     */
-    function setField($selector, $value, $position=false) {
-        $success = false;
-        $_position = 0;
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->_widgets[$i])) {
-                $_position++;
-                if ($position === false or $_position === (int)$position) {
-                    if ($this->_widgets[$i]->setValue($value)) {
-                        $success = true;
-                    }
-                }
-            }
-        }
-        return $success;
-    }
-
-    /**
-     *    Used by the page object to set widgets labels to
-     *    external label tags.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @access public
-     */
-    function attachLabelBySelector($selector, $label) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->_widgets[$i])) {
-                if (method_exists($this->_widgets[$i], 'setLabel')) {
-                    $this->_widgets[$i]->setLabel($label);
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     *    Test to see if a form has a submit button.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return boolean                   True if present.
-     *    @access public
-     */
-    function hasSubmit($selector) {
-        foreach ($this->_buttons as $button) {
-            if ($selector->isMatch($button)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Test to see if a form has an image control.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return boolean                   True if present.
-     *    @access public
-     */
-    function hasImage($selector) {
-        foreach ($this->_images as $image) {
-            if ($selector->isMatch($image)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Gets the submit values for a selected button.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param hash $additional           Additional data for the form.
-     *    @return SimpleEncoding            Submitted values or false
-     *                                      if there is no such button
-     *                                      in the form.
-     *    @access public
-     */
-    function submitButton($selector, $additional = false) {
-        $additional = $additional ? $additional : array();
-        foreach ($this->_buttons as $button) {
-            if ($selector->isMatch($button)) {
-                $encoding = $this->_encode();
-                $button->write($encoding);
-                if ($additional) {
-                    $encoding->merge($additional);
-                }
-                return $encoding;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Gets the submit values for an image.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param integer $x                 X-coordinate of click.
-     *    @param integer $y                 Y-coordinate of click.
-     *    @param hash $additional           Additional data for the form.
-     *    @return SimpleEncoding            Submitted values or false
-     *                                      if there is no such button in the
-     *                                      form.
-     *    @access public
-     */
-    function submitImage($selector, $x, $y, $additional = false) {
-        $additional = $additional ? $additional : array();
-        foreach ($this->_images as $image) {
-            if ($selector->isMatch($image)) {
-                $encoding = $this->_encode();
-                $image->write($encoding, $x, $y);
-                if ($additional) {
-                    $encoding->merge($additional);
-                }
-                return $encoding;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Simply submits the form without the submit button
-     *    value. Used when there is only one button or it
-     *    is unimportant.
-     *    @return hash           Submitted values.
-     *    @access public
-     */
-    function submit() {
-        return $this->_encode();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/frames.php b/tests/simpletest/frames.php
deleted file mode 100755
index ec098df9e0..0000000000
--- a/tests/simpletest/frames.php
+++ /dev/null
@@ -1,596 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: frames.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/user_agent.php');
-/**#@-*/
-
-/**
- *    A composite page. Wraps a frameset page and
- *    adds subframes. The original page will be
- *    mostly ignored. Implements the SimplePage
- *    interface so as to be interchangeable.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFrameset {
-    var $_frameset;
-    var $_frames;
-    var $_focus;
-    var $_names;
-
-    /**
-     *    Stashes the frameset page. Will make use of the
-     *    browser to fetch the sub frames recursively.
-     *    @param SimplePage $page        Frameset page.
-     */
-    function SimpleFrameset(&$page) {
-        $this->_frameset = &$page;
-        $this->_frames = array();
-        $this->_focus = false;
-        $this->_names = array();
-    }
-
-    /**
-     *    Adds a parsed page to the frameset.
-     *    @param SimplePage $page    Frame page.
-     *    @param string $name        Name of frame in frameset.
-     *    @access public
-     */
-    function addFrame(&$page, $name = false) {
-        $this->_frames[] = &$page;
-        if ($name) {
-            $this->_names[$name] = count($this->_frames) - 1;
-        }
-    }
-
-    /**
-     *    Replaces existing frame with another. If the
-     *    frame is nested, then the call is passed down
-     *    one level.
-     *    @param array $path        Path of frame in frameset.
-     *    @param SimplePage $page   Frame source.
-     *    @access public
-     */
-    function setFrame($path, &$page) {
-        $name = array_shift($path);
-        if (isset($this->_names[$name])) {
-            $index = $this->_names[$name];
-        } else {
-            $index = $name - 1;
-        }
-        if (count($path) == 0) {
-            $this->_frames[$index] = &$page;
-            return;
-        }
-        $this->_frames[$index]->setFrame($path, $page);
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus. Will have the nested
-     *    frame focus if any.
-     *    @return array     Labels or indexes of nested frames.
-     *    @access public
-     */
-    function getFrameFocus() {
-        if ($this->_focus === false) {
-            return array();
-        }
-        return array_merge(
-                array($this->_getPublicNameFromIndex($this->_focus)),
-                $this->_frames[$this->_focus]->getFrameFocus());
-    }
-
-    /**
-     *    Turns an internal array index into the frames list
-     *    into a public name, or if none, then a one offset
-     *    index.
-     *    @param integer $subject    Internal index.
-     *    @return integer/string     Public name.
-     *    @access private
-     */
-    function _getPublicNameFromIndex($subject) {
-        foreach ($this->_names as $name => $index) {
-            if ($subject == $index) {
-                return $name;
-            }
-        }
-        return $subject + 1;
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    If already focused and the target frame also has frames,
-     *    then the nested frame will be focused.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        if (is_integer($this->_focus)) {
-            if ($this->_frames[$this->_focus]->hasFrames()) {
-                return $this->_frames[$this->_focus]->setFrameFocusByIndex($choice);
-            }
-        }
-        if (($choice < 1) || ($choice > count($this->_frames))) {
-            return false;
-        }
-        $this->_focus = $choice - 1;
-        return true;
-    }
-
-    /**
-     *    Sets the focus by name. If already focused and the
-     *    target frame also has frames, then the nested frame
-     *    will be focused.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        if (is_integer($this->_focus)) {
-            if ($this->_frames[$this->_focus]->hasFrames()) {
-                return $this->_frames[$this->_focus]->setFrameFocus($name);
-            }
-        }
-        if (in_array($name, array_keys($this->_names))) {
-            $this->_focus = $this->_names[$name];
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Clears the frame focus.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        $this->_focus = false;
-        $this->_clearNestedFramesFocus();
-    }
-
-    /**
-     *    Clears the frame focus for any nested frames.
-     *    @access private
-     */
-    function _clearNestedFramesFocus() {
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $this->_frames[$i]->clearFrameFocus();
-        }
-    }
-
-    /**
-     *    Test for the presence of a frameset.
-     *    @return boolean        Always true.
-     *    @access public
-     */
-    function hasFrames() {
-        return true;
-    }
-
-    /**
-     *    Accessor for frames information.
-     *    @return array/string      Recursive hash of frame URL strings.
-     *                              The key is either a numerical
-     *                              index or the name attribute.
-     *    @access public
-     */
-    function getFrames() {
-        $report = array();
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $report[$this->_getPublicNameFromIndex($i)] =
-                    $this->_frames[$i]->getFrames();
-        }
-        return $report;
-    }
-
-    /**
-     *    Accessor for raw text of either all the pages or
-     *    the frame in focus.
-     *    @return string        Raw unparsed content.
-     *    @access public
-     */
-    function getRaw() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRaw();
-        }
-        $raw = '';
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $raw .= $this->_frames[$i]->getRaw();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for plain text of either all the pages or
-     *    the frame in focus.
-     *    @return string        Plain text content.
-     *    @access public
-     */
-    function getText() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getText();
-        }
-        $raw = '';
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $raw .= ' ' . $this->_frames[$i]->getText();
-        }
-        return trim($raw);
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getTransportError();
-        }
-        return $this->_frameset->getTransportError();
-    }
-
-    /**
-     *    Request method used to fetch this frame.
-     *    @return string      GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getMethod();
-        }
-        return $this->_frameset->getMethod();
-    }
-
-    /**
-     *    Original resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        if (is_integer($this->_focus)) {
-            $url = $this->_frames[$this->_focus]->getUrl();
-            $url->setTarget($this->_getPublicNameFromIndex($this->_focus));
-        } else {
-            $url = $this->_frameset->getUrl();
-        }
-        return $url;
-    }
-
-    /**
-     *    Page base URL.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getBaseUrl() {
-        if (is_integer($this->_focus)) {
-            $url = $this->_frames[$this->_focus]->getBaseUrl();
-        } else {
-            $url = $this->_frameset->getBaseUrl();
-        }
-        return $url;
-    }
-
-    /**
-     *    Expands expandomatic URLs into fully qualified
-     *    URLs for the frameset page.
-     *    @param SimpleUrl $url        Relative URL.
-     *    @return SimpleUrl            Absolute URL.
-     *    @access public
-     */
-    function expandUrl($url) {
-        return $this->_frameset->expandUrl($url);
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRequestData();
-        }
-        return $this->_frameset->getRequestData();
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getMimeType();
-        }
-        return $this->_frameset->getMimeType();
-    }
-
-    /**
-     *    Accessor for last response code.
-     *    @return integer    Last HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getResponseCode();
-        }
-        return $this->_frameset->getResponseCode();
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getAuthentication();
-        }
-        return $this->_frameset->getAuthentication();
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRealm();
-        }
-        return $this->_frameset->getRealm();
-    }
-
-    /**
-     *    Accessor for outgoing header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getRequest() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRequest();
-        }
-        return $this->_frameset->getRequest();
-    }
-
-    /**
-     *    Accessor for raw header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getHeaders() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getHeaders();
-        }
-        return $this->_frameset->getHeaders();
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        return $this->_frameset->getTitle();
-    }
-
-    /**
-     *    Accessor for a list of all fixed links.
-     *    @return array   List of urls as strings.
-     *    @access public
-     */
-    function getUrls() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getUrls();
-        }
-        $urls = array();
-        foreach ($this->_frames as $frame) {
-            $urls = array_merge($urls, $frame->getUrls());
-        }
-        return array_values(array_unique($urls));
-    }
-
-    /**
-     *    Accessor for URLs by the link label. Label will match
-     *    regardess of whitespace issues and case.
-     *    @param string $label    Text of link.
-     *    @return array           List of links with that label.
-     *    @access public
-     */
-    function getUrlsByLabel($label) {
-        if (is_integer($this->_focus)) {
-            return $this->_tagUrlsWithFrame(
-                    $this->_frames[$this->_focus]->getUrlsByLabel($label),
-                    $this->_focus);
-        }
-        $urls = array();
-        foreach ($this->_frames as $index => $frame) {
-            $urls = array_merge(
-                    $urls,
-                    $this->_tagUrlsWithFrame(
-                                $frame->getUrlsByLabel($label),
-                                $index));
-        }
-        return $urls;
-    }
-
-    /**
-     *    Accessor for a URL by the id attribute. If in a frameset
-     *    then the first link found with that ID attribute is
-     *    returned only. Focus on a frame if you want one from
-     *    a specific part of the frameset.
-     *    @param string $id       Id attribute of link.
-     *    @return string          URL with that id.
-     *    @access public
-     */
-    function getUrlById($id) {
-        foreach ($this->_frames as $index => $frame) {
-            if ($url = $frame->getUrlById($id)) {
-                if (! $url->gettarget()) {
-                    $url->setTarget($this->_getPublicNameFromIndex($index));
-                }
-                return $url;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Attaches the intended frame index to a list of URLs.
-     *    @param array $urls        List of SimpleUrls.
-     *    @param string $frame      Name of frame or index.
-     *    @return array             List of tagged URLs.
-     *    @access private
-     */
-    function _tagUrlsWithFrame($urls, $frame) {
-        $tagged = array();
-        foreach ($urls as $url) {
-            if (! $url->getTarget()) {
-                $url->setTarget($this->_getPublicNameFromIndex($frame));
-            }
-            $tagged[] = $url;
-        }
-        return $tagged;
-    }
-
-    /**
-     *    Finds a held form by button label. Will only
-     *    search correctly built forms.
-     *    @param SimpleSelector $selector       Button finder.
-     *    @return SimpleForm                    Form object containing
-     *                                          the button.
-     *    @access public
-     */
-    function &getFormBySubmit($selector) {
-        $form = &$this->_findForm('getFormBySubmit', $selector);
-        return $form;
-    }
-
-    /**
-     *    Finds a held form by image using a selector.
-     *    Will only search correctly built forms. The first
-     *    form found either within the focused frame, or
-     *    across frames, will be the one returned.
-     *    @param SimpleSelector $selector  Image finder.
-     *    @return SimpleForm               Form object containing
-     *                                     the image.
-     *    @access public
-     */
-    function &getFormByImage($selector) {
-        $form = &$this->_findForm('getFormByImage', $selector);
-        return $form;
-    }
-
-    /**
-     *    Finds a held form by the form ID. A way of
-     *    identifying a specific form when we have control
-     *    of the HTML code. The first form found
-     *    either within the focused frame, or across frames,
-     *    will be the one returned.
-     *    @param string $id     Form label.
-     *    @return SimpleForm    Form object containing the matching ID.
-     *    @access public
-     */
-    function &getFormById($id) {
-        $form = &$this->_findForm('getFormById', $id);
-        return $form;
-    }
-
-    /**
-        *    General form finder. Will search all the frames or
-        *    just the one in focus.
-        *    @param string $method    Method to use to find in a page.
-        *    @param string $attribute Label, name or ID.
-        *    @return SimpleForm    Form object containing the matching ID.
-        *    @access private
-        */
-    function &_findForm($method, $attribute) {
-        if (is_integer($this->_focus)) {
-            $form = &$this->_findFormInFrame(
-                    $this->_frames[$this->_focus],
-                    $this->_focus,
-                    $method,
-                    $attribute);
-            return $form;
-        }
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $form = &$this->_findFormInFrame(
-                    $this->_frames[$i],
-                    $i,
-                    $method,
-                    $attribute);
-            if ($form) {
-                return $form;
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a form in a page using a form finding method. Will
-     *    also tag the form with the frame name it belongs in.
-     *    @param SimplePage $page  Page content of frame.
-     *    @param integer $index    Internal frame representation.
-     *    @param string $method    Method to use to find in a page.
-     *    @param string $attribute Label, name or ID.
-     *    @return SimpleForm       Form object containing the matching ID.
-     *    @access private
-     */
-    function &_findFormInFrame(&$page, $index, $method, $attribute) {
-        $form = &$this->_frames[$index]->$method($attribute);
-        if (isset($form)) {
-            $form->setDefaultTarget($this->_getPublicNameFromIndex($index));
-        }
-        return $form;
-    }
-
-    /**
-     *    Sets a field on each form in which the field is
-     *    available.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @param string $value               Value to set field to.
-     *    @return boolean                    True if value is valid.
-     *    @access public
-     */
-    function setField($selector, $value) {
-        if (is_integer($this->_focus)) {
-            $this->_frames[$this->_focus]->setField($selector, $value);
-        } else {
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $this->_frames[$i]->setField($selector, $value);
-            }
-        }
-    }
-
-    /**
-     *    Accessor for a form element value within a page.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @return string/boolean             A string if the field is
-     *                                       present, false if unchecked
-     *                                       and null if missing.
-     *    @access public
-     */
-    function getField($selector) {
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $value = $this->_frames[$i]->getField($selector);
-            if (isset($value)) {
-                return $value;
-            }
-        }
-        return null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/http.php b/tests/simpletest/http.php
deleted file mode 100755
index 73689f23ab..0000000000
--- a/tests/simpletest/http.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: http.php 1722 2008-04-07 19:30:56Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/socket.php');
-require_once(dirname(__FILE__) . '/cookies.php');
-require_once(dirname(__FILE__) . '/url.php');
-/**#@-*/
-
-/**
- *    Creates HTTP headers for the end point of
- *    a HTTP request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRoute {
-    var $_url;
-
-    /**
-     *    Sets the target URL.
-     *    @param SimpleUrl $url   URL as object.
-     *    @access public
-     */
-    function SimpleRoute($url) {
-        $this->_url = $url;
-    }
-
-    /**
-     *    Resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access protected
-     */
-    function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     *    Creates the first line which is the actual request.
-     *    @param string $method   HTTP request method, usually GET.
-     *    @return string          Request line content.
-     *    @access protected
-     */
-    function _getRequestLine($method) {
-        return $method . ' ' . $this->_url->getPath() .
-                $this->_url->getEncodedRequest() . ' HTTP/1.0';
-    }
-
-    /**
-     *    Creates the host part of the request.
-     *    @return string          Host line content.
-     *    @access protected
-     */
-    function _getHostLine() {
-        $line = 'Host: ' . $this->_url->getHost();
-        if ($this->_url->getPort()) {
-            $line .= ':' . $this->_url->getPort();
-        }
-        return $line;
-    }
-
-    /**
-     *    Opens a socket to the route.
-     *    @param string $method      HTTP request method, usually GET.
-     *    @param integer $timeout    Connection timeout.
-     *    @return SimpleSocket       New socket.
-     *    @access public
-     */
-    function &createConnection($method, $timeout) {
-        $default_port = ('https' == $this->_url->getScheme()) ? 443 : 80;
-        $socket = &$this->_createSocket(
-                $this->_url->getScheme() ? $this->_url->getScheme() : 'http',
-                $this->_url->getHost(),
-                $this->_url->getPort() ? $this->_url->getPort() : $default_port,
-                $timeout);
-        if (! $socket->isError()) {
-            $socket->write($this->_getRequestLine($method) . "\r\n");
-            $socket->write($this->_getHostLine() . "\r\n");
-            $socket->write("Connection: close\r\n");
-        }
-        return $socket;
-    }
-
-    /**
-     *    Factory for socket.
-     *    @param string $scheme                   Protocol to use.
-     *    @param string $host                     Hostname to connect to.
-     *    @param integer $port                    Remote port.
-     *    @param integer $timeout                 Connection timeout.
-     *    @return SimpleSocket/SimpleSecureSocket New socket.
-     *    @access protected
-     */
-    function &_createSocket($scheme, $host, $port, $timeout) {
-        if (in_array($scheme, array('https'))) {
-            $socket = &new SimpleSecureSocket($host, $port, $timeout);
-        } else {
-            $socket = &new SimpleSocket($host, $port, $timeout);
-        }
-        return $socket;
-    }
-}
-
-/**
- *    Creates HTTP headers for the end point of
- *    a HTTP request via a proxy server.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleProxyRoute extends SimpleRoute {
-    var $_proxy;
-    var $_username;
-    var $_password;
-
-    /**
-     *    Stashes the proxy address.
-     *    @param SimpleUrl $url     URL as object.
-     *    @param string $proxy      Proxy URL.
-     *    @param string $username   Username for autentication.
-     *    @param string $password   Password for autentication.
-     *    @access public
-     */
-    function SimpleProxyRoute($url, $proxy, $username = false, $password = false) {
-        $this->SimpleRoute($url);
-        $this->_proxy = $proxy;
-        $this->_username = $username;
-        $this->_password = $password;
-    }
-
-    /**
-     *    Creates the first line which is the actual request.
-     *    @param string $method   HTTP request method, usually GET.
-     *    @param SimpleUrl $url   URL as object.
-     *    @return string          Request line content.
-     *    @access protected
-     */
-    function _getRequestLine($method) {
-        $url = $this->getUrl();
-        $scheme = $url->getScheme() ? $url->getScheme() : 'http';
-        $port = $url->getPort() ? ':' . $url->getPort() : '';
-        return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
-                $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
-    }
-
-    /**
-     *    Creates the host part of the request.
-     *    @param SimpleUrl $url   URL as object.
-     *    @return string          Host line content.
-     *    @access protected
-     */
-    function _getHostLine() {
-        $host = 'Host: ' . $this->_proxy->getHost();
-        $port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
-        return "$host:$port";
-    }
-
-    /**
-     *    Opens a socket to the route.
-     *    @param string $method       HTTP request method, usually GET.
-     *    @param integer $timeout     Connection timeout.
-     *    @return SimpleSocket        New socket.
-     *    @access public
-     */
-    function &createConnection($method, $timeout) {
-        $socket = &$this->_createSocket(
-                $this->_proxy->getScheme() ? $this->_proxy->getScheme() : 'http',
-                $this->_proxy->getHost(),
-                $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080,
-                $timeout);
-        if ($socket->isError()) {
-            return $socket;
-        }
-        $socket->write($this->_getRequestLine($method) . "\r\n");
-        $socket->write($this->_getHostLine() . "\r\n");
-        if ($this->_username && $this->_password) {
-            $socket->write('Proxy-Authorization: Basic ' .
-                    base64_encode($this->_username . ':' . $this->_password) .
-                    "\r\n");
-        }
-        $socket->write("Connection: close\r\n");
-        return $socket;
-    }
-}
-
-/**
- *    HTTP request for a web page. Factory for
- *    HttpResponse object.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpRequest {
-    var $_route;
-    var $_encoding;
-    var $_headers;
-    var $_cookies;
-
-    /**
-     *    Builds the socket request from the different pieces.
-     *    These include proxy information, URL, cookies, headers,
-     *    request method and choice of encoding.
-     *    @param SimpleRoute $route              Request route.
-     *    @param SimpleFormEncoding $encoding    Content to send with
-     *                                           request.
-     *    @access public
-     */
-    function SimpleHttpRequest(&$route, $encoding) {
-        $this->_route = &$route;
-        $this->_encoding = $encoding;
-        $this->_headers = array();
-        $this->_cookies = array();
-    }
-
-    /**
-     *    Dispatches the content to the route's socket.
-     *    @param integer $timeout      Connection timeout.
-     *    @return SimpleHttpResponse   A response which may only have
-     *                                 an error, but hopefully has a
-     *                                 complete web page.
-     *    @access public
-     */
-    function &fetch($timeout) {
-        $socket = &$this->_route->createConnection($this->_encoding->getMethod(), $timeout);
-        if (! $socket->isError()) {
-            $this->_dispatchRequest($socket, $this->_encoding);
-        }
-        $response = &$this->_createResponse($socket);
-        return $response;
-    }
-
-    /**
-     *    Sends the headers.
-     *    @param SimpleSocket $socket           Open socket.
-     *    @param string $method                 HTTP request method,
-     *                                          usually GET.
-     *    @param SimpleFormEncoding $encoding   Content to send with request.
-     *    @access private
-     */
-    function _dispatchRequest(&$socket, $encoding) {
-        foreach ($this->_headers as $header_line) {
-            $socket->write($header_line . "\r\n");
-        }
-        if (count($this->_cookies) > 0) {
-            $socket->write("Cookie: " . implode(";", $this->_cookies) . "\r\n");
-        }
-        $encoding->writeHeadersTo($socket);
-        $socket->write("\r\n");
-        $encoding->writeTo($socket);
-    }
-
-    /**
-     *    Adds a header line to the request.
-     *    @param string $header_line    Text of full header line.
-     *    @access public
-     */
-    function addHeaderLine($header_line) {
-        $this->_headers[] = $header_line;
-    }
-
-    /**
-     *    Reads all the relevant cookies from the
-     *    cookie jar.
-     *    @param SimpleCookieJar $jar     Jar to read
-     *    @param SimpleUrl $url           Url to use for scope.
-     *    @access public
-     */
-    function readCookiesFromJar($jar, $url) {
-        $this->_cookies = $jar->selectAsPairs($url);
-    }
-
-    /**
-     *    Wraps the socket in a response parser.
-     *    @param SimpleSocket $socket   Responding socket.
-     *    @return SimpleHttpResponse    Parsed response object.
-     *    @access protected
-     */
-    function &_createResponse(&$socket) {
-        $response = &new SimpleHttpResponse(
-                $socket,
-                $this->_route->getUrl(),
-                $this->_encoding);
-        return $response;
-    }
-}
-
-/**
- *    Collection of header lines in the response.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpHeaders {
-    var $_raw_headers;
-    var $_response_code;
-    var $_http_version;
-    var $_mime_type;
-    var $_location;
-    var $_cookies;
-    var $_authentication;
-    var $_realm;
-
-    /**
-     *    Parses the incoming header block.
-     *    @param string $headers     Header block.
-     *    @access public
-     */
-    function SimpleHttpHeaders($headers) {
-        $this->_raw_headers = $headers;
-        $this->_response_code = false;
-        $this->_http_version = false;
-        $this->_mime_type = '';
-        $this->_location = false;
-        $this->_cookies = array();
-        $this->_authentication = false;
-        $this->_realm = false;
-        foreach (split("\r\n", $headers) as $header_line) {
-            $this->_parseHeaderLine($header_line);
-        }
-    }
-
-    /**
-     *    Accessor for parsed HTTP protocol version.
-     *    @return integer           HTTP error code.
-     *    @access public
-     */
-    function getHttpVersion() {
-        return $this->_http_version;
-    }
-
-    /**
-     *    Accessor for raw header block.
-     *    @return string        All headers as raw string.
-     *    @access public
-     */
-    function getRaw() {
-        return $this->_raw_headers;
-    }
-
-    /**
-     *    Accessor for parsed HTTP error code.
-     *    @return integer           HTTP error code.
-     *    @access public
-     */
-    function getResponseCode() {
-        return (integer)$this->_response_code;
-    }
-
-    /**
-     *    Returns the redirected URL or false if
-     *    no redirection.
-     *    @return string      URL or false for none.
-     *    @access public
-     */
-    function getLocation() {
-        return $this->_location;
-    }
-
-    /**
-     *    Test to see if the response is a valid redirect.
-     *    @return boolean       True if valid redirect.
-     *    @access public
-     */
-    function isRedirect() {
-        return in_array($this->_response_code, array(301, 302, 303, 307)) &&
-                (boolean)$this->getLocation();
-    }
-
-    /**
-     *    Test to see if the response is an authentication
-     *    challenge.
-     *    @return boolean       True if challenge.
-     *    @access public
-     */
-    function isChallenge() {
-        return ($this->_response_code == 401) &&
-                (boolean)$this->_authentication &&
-                (boolean)$this->_realm;
-    }
-
-    /**
-     *    Accessor for MIME type header information.
-     *    @return string           MIME type.
-     *    @access public
-     */
-    function getMimeType() {
-        return $this->_mime_type;
-    }
-
-    /**
-     *    Accessor for authentication type.
-     *    @return string        Type.
-     *    @access public
-     */
-    function getAuthentication() {
-        return $this->_authentication;
-    }
-
-    /**
-     *    Accessor for security realm.
-     *    @return string        Realm.
-     *    @access public
-     */
-    function getRealm() {
-        return $this->_realm;
-    }
-
-    /**
-     *    Writes new cookies to the cookie jar.
-     *    @param SimpleCookieJar $jar   Jar to write to.
-     *    @param SimpleUrl $url         Host and path to write under.
-     *    @access public
-     */
-    function writeCookiesToJar(&$jar, $url) {
-        foreach ($this->_cookies as $cookie) {
-            $jar->setCookie(
-                    $cookie->getName(),
-                    $cookie->getValue(),
-                    $url->getHost(),
-                    $cookie->getPath(),
-                    $cookie->getExpiry());
-        }
-    }
-
-    /**
-     *    Called on each header line to accumulate the held
-     *    data within the class.
-     *    @param string $header_line        One line of header.
-     *    @access protected
-     */
-    function _parseHeaderLine($header_line) {
-        if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
-            $this->_http_version = $matches[1];
-            $this->_response_code = $matches[2];
-        }
-        if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
-            $this->_mime_type = trim($matches[1]);
-        }
-        if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
-            $this->_location = trim($matches[1]);
-        }
-        if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
-            $this->_cookies[] = $this->_parseCookie($matches[1]);
-        }
-        if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
-            $this->_authentication = $matches[1];
-            $this->_realm = trim($matches[2]);
-        }
-    }
-
-    /**
-     *    Parse the Set-cookie content.
-     *    @param string $cookie_line    Text after "Set-cookie:"
-     *    @return SimpleCookie          New cookie object.
-     *    @access private
-     */
-    function _parseCookie($cookie_line) {
-        $parts = split(";", $cookie_line);
-        $cookie = array();
-        preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
-        foreach ($parts as $part) {
-            if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
-                $cookie[$matches[1]] = trim($matches[2]);
-            }
-        }
-        return new SimpleCookie(
-                $cookie[1],
-                trim($cookie[2]),
-                isset($cookie["path"]) ? $cookie["path"] : "",
-                isset($cookie["expires"]) ? $cookie["expires"] : false);
-    }
-}
-
-/**
- *    Basic HTTP response.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpResponse extends SimpleStickyError {
-    var $_url;
-    var $_encoding;
-    var $_sent;
-    var $_content;
-    var $_headers;
-
-    /**
-     *    Constructor. Reads and parses the incoming
-     *    content and headers.
-     *    @param SimpleSocket $socket   Network connection to fetch
-     *                                  response text from.
-     *    @param SimpleUrl $url         Resource name.
-     *    @param mixed $encoding        Record of content sent.
-     *    @access public
-     */
-    function SimpleHttpResponse(&$socket, $url, $encoding) {
-        $this->SimpleStickyError();
-        $this->_url = $url;
-        $this->_encoding = $encoding;
-        $this->_sent = $socket->getSent();
-        $this->_content = false;
-        $raw = $this->_readAll($socket);
-        if ($socket->isError()) {
-            $this->_setError('Error reading socket [' . $socket->getError() . ']');
-            return;
-        }
-        $this->_parse($raw);
-    }
-
-    /**
-     *    Splits up the headers and the rest of the content.
-     *    @param string $raw    Content to parse.
-     *    @access private
-     */
-    function _parse($raw) {
-        if (! $raw) {
-            $this->_setError('Nothing fetched');
-            $this->_headers = &new SimpleHttpHeaders('');
-        } elseif (! strstr($raw, "\r\n\r\n")) {
-            $this->_setError('Could not split headers from content');
-            $this->_headers = &new SimpleHttpHeaders($raw);
-        } else {
-            list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
-            $this->_headers = &new SimpleHttpHeaders($headers);
-        }
-    }
-
-    /**
-     *    Original request method.
-     *    @return string        GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return $this->_encoding->getMethod();
-    }
-
-    /**
-     *    Resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        return $this->_encoding;
-    }
-
-    /**
-     *    Raw request that was sent down the wire.
-     *    @return string        Bytes actually sent.
-     *    @access public
-     */
-    function getSent() {
-        return $this->_sent;
-    }
-
-    /**
-     *    Accessor for the content after the last
-     *    header line.
-     *    @return string           All content.
-     *    @access public
-     */
-    function getContent() {
-        return $this->_content;
-    }
-
-    /**
-     *    Accessor for header block. The response is the
-     *    combination of this and the content.
-     *    @return SimpleHeaders        Wrapped header block.
-     *    @access public
-     */
-    function getHeaders() {
-        return $this->_headers;
-    }
-
-    /**
-     *    Accessor for any new cookies.
-     *    @return array       List of new cookies.
-     *    @access public
-     */
-    function getNewCookies() {
-        return $this->_headers->getNewCookies();
-    }
-
-    /**
-     *    Reads the whole of the socket output into a
-     *    single string.
-     *    @param SimpleSocket $socket  Unread socket.
-     *    @return string               Raw output if successful
-     *                                 else false.
-     *    @access private
-     */
-    function _readAll(&$socket) {
-        $all = '';
-        while (! $this->_isLastPacket($next = $socket->read())) {
-            $all .= $next;
-        }
-        return $all;
-    }
-
-    /**
-     *    Test to see if the packet from the socket is the
-     *    last one.
-     *    @param string $packet    Chunk to interpret.
-     *    @return boolean          True if empty or EOF.
-     *    @access private
-     */
-    function _isLastPacket($packet) {
-        if (is_string($packet)) {
-            return $packet === '';
-        }
-        return ! $packet;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/index.html b/tests/simpletest/index.html
deleted file mode 100755
index 8e464d8ce3..0000000000
--- a/tests/simpletest/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-</head>
-<body>
-<br />
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/simpletest/invoker.php b/tests/simpletest/invoker.php
deleted file mode 100755
index e2730013e5..0000000000
--- a/tests/simpletest/invoker.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: invoker.php 1722 2008-04-07 19:30:56Z lastcraft $
- */
-
-/**#@+
- * Includes SimpleTest files and defined the root constant
- * for dependent libraries.
- */
-require_once(dirname(__FILE__) . '/errors.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-if (! defined('SIMPLE_TEST')) {
-    define('SIMPLE_TEST', dirname(__FILE__) . '/');
-}
-/**#@-*/
-
-/**
- *    This is called by the class runner to run a
- *    single test method. Will also run the setUp()
- *    and tearDown() methods.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleInvoker {
-    var $_test_case;
-
-    /**
-     *    Stashes the test case for later.
-     *    @param SimpleTestCase $test_case  Test case to run.
-     */
-    function SimpleInvoker(&$test_case) {
-        $this->_test_case = &$test_case;
-    }
-
-    /**
-     *    Accessor for test case being run.
-     *    @return SimpleTestCase    Test case.
-     *    @access public
-     */
-    function &getTestCase() {
-        return $this->_test_case;
-    }
-
-    /**
-     *    Runs test level set up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method) {
-        $this->_test_case->before($method);
-    }
-
-    /**
-     *    Invokes a test method and buffered with setUp()
-     *    and tearDown() calls.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $this->_test_case->setUp();
-        $this->_test_case->$method();
-        $this->_test_case->tearDown();
-    }
-
-    /**
-     *    Runs test level clean up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->_test_case->after($method);
-    }
-}
-
-/**
- *    Do nothing decorator. Just passes the invocation
- *    straight through.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleInvokerDecorator {
-    var $_invoker;
-
-    /**
-     *    Stores the invoker to wrap.
-     *    @param SimpleInvoker $invoker  Test method runner.
-     */
-    function SimpleInvokerDecorator(&$invoker) {
-        $this->_invoker = &$invoker;
-    }
-
-    /**
-     *    Accessor for test case being run.
-     *    @return SimpleTestCase    Test case.
-     *    @access public
-     */
-    function &getTestCase() {
-        return $this->_invoker->getTestCase();
-    }
-
-    /**
-     *    Runs test level set up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method) {
-        $this->_invoker->before($method);
-    }
-
-    /**
-     *    Invokes a test method and buffered with setUp()
-     *    and tearDown() calls.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $this->_invoker->invoke($method);
-    }
-
-    /**
-     *    Runs test level clean up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->_invoker->after($method);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/mock_objects.php b/tests/simpletest/mock_objects.php
deleted file mode 100755
index 5baf4a1163..0000000000
--- a/tests/simpletest/mock_objects.php
+++ /dev/null
@@ -1,1581 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: mock_objects.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-if (version_compare(phpversion(), '5') >= 0) {
-    require_once(dirname(__FILE__) . '/reflection_php5.php');
-} else {
-    require_once(dirname(__FILE__) . '/reflection_php4.php');
-}
-/**#@-*/
-
-/**
- * Default character simpletest will substitute for any value
- */
-if (! defined('MOCK_ANYTHING')) {
-    define('MOCK_ANYTHING', '*');
-}
-
-/**
- *    Parameter comparison assertion.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class ParametersExpectation extends SimpleExpectation {
-    var $_expected;
-
-    /**
-     *    Sets the expected parameter list.
-     *    @param array $parameters  Array of parameters including
-     *                              those that are wildcarded.
-     *                              If the value is not an array
-     *                              then it is considered to match any.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function ParametersExpectation($expected = false, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_expected = $expected;
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param array $parameters     Comparison values.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($parameters) {
-        if (! is_array($this->_expected)) {
-            return true;
-        }
-        if (count($this->_expected) != count($parameters)) {
-            return false;
-        }
-        for ($i = 0; $i < count($this->_expected); $i++) {
-            if (! $this->_testParameter($parameters[$i], $this->_expected[$i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests an individual parameter.
-     *    @param mixed $parameter    Value to test.
-     *    @param mixed $expected     Comparison value.
-     *    @return boolean            True if expectation
-     *                               fulfilled.
-     *    @access private
-     */
-    function _testParameter($parameter, $expected) {
-        $comparison = $this->_coerceToExpectation($expected);
-        return $comparison->test($parameter);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param array $comparison   Incoming parameter list.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($parameters) {
-        if ($this->test($parameters)) {
-            return "Expectation of " . count($this->_expected) .
-                    " arguments of [" . $this->_renderArguments($this->_expected) .
-                    "] is correct";
-        } else {
-            return $this->_describeDifference($this->_expected, $parameters);
-        }
-    }
-
-    /**
-     *    Message to display if expectation differs from
-     *    the parameters actually received.
-     *    @param array $expected      Expected parameters as list.
-     *    @param array $parameters    Actual parameters received.
-     *    @return string              Description of difference.
-     *    @access private
-     */
-    function _describeDifference($expected, $parameters) {
-        if (count($expected) != count($parameters)) {
-            return "Expected " . count($expected) .
-                    " arguments of [" . $this->_renderArguments($expected) .
-                    "] but got " . count($parameters) .
-                    " arguments of [" . $this->_renderArguments($parameters) . "]";
-        }
-        $messages = array();
-        for ($i = 0; $i < count($expected); $i++) {
-            $comparison = $this->_coerceToExpectation($expected[$i]);
-            if (! $comparison->test($parameters[$i])) {
-                $messages[] = "parameter " . ($i + 1) . " with [" .
-                        $comparison->overlayMessage($parameters[$i], $this->_getDumper()) . "]";
-            }
-        }
-        return "Parameter expectation differs at " . implode(" and ", $messages);
-    }
-
-    /**
-     *    Creates an identical expectation if the
-     *    object/value is not already some type
-     *    of expectation.
-     *    @param mixed $expected      Expected value.
-     *    @return SimpleExpectation   Expectation object.
-     *    @access private
-     */
-    function _coerceToExpectation($expected) {
-        if (SimpleExpectation::isExpectation($expected)) {
-            return $expected;
-        }
-        return new IdenticalExpectation($expected);
-    }
-
-    /**
-     *    Renders the argument list as a string for
-     *    messages.
-     *    @param array $args    Incoming arguments.
-     *    @return string        Simple description of type and value.
-     *    @access private
-     */
-    function _renderArguments($args) {
-        $descriptions = array();
-        if (is_array($args)) {
-            foreach ($args as $arg) {
-                $dumper = &new SimpleDumper();
-                $descriptions[] = $dumper->describeValue($arg);
-            }
-        }
-        return implode(', ', $descriptions);
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *  @package    SimpleTest
- *  @subpackage MockObjects
- */
-class CallCountExpectation extends SimpleExpectation {
-    var $_method;
-    var $_count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Expected number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function CallCountExpectation($method, $count, $message = '%s') {
-        $this->_method = $method;
-        $this->_count = $count;
-        $this->SimpleExpectation($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if expected.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_count == $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     *    @access public
-     */
-    function testMessage($compare) {
-        return 'Expected call count for [' . $this->_method .
-                '] was [' . $this->_count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *  @package    SimpleTest
- *  @subpackage MockObjects
- */
-class MinimumCallCountExpectation extends SimpleExpectation {
-    var $_method;
-    var $_count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Minimum number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function MinimumCallCountExpectation($method, $count, $message = '%s') {
-        $this->_method = $method;
-        $this->_count = $count;
-        $this->SimpleExpectation($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if enough.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_count <= $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     *    @access public
-     */
-    function testMessage($compare) {
-        return 'Minimum call count for [' . $this->_method .
-                '] was [' . $this->_count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *    @package      SimpleTest
- *    @subpackage   MockObjects
- */
-class MaximumCallCountExpectation extends SimpleExpectation {
-    var $_method;
-    var $_count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Minimum number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function MaximumCallCountExpectation($method, $count, $message = '%s') {
-        $this->_method = $method;
-        $this->_count = $count;
-        $this->SimpleExpectation($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if not over.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_count >= $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     *    @access public
-     */
-    function testMessage($compare) {
-        return 'Maximum call count for [' . $this->_method .
-                '] was [' . $this->_count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Retrieves method actions by searching the
- *    parameter lists until an expected match is found.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleSignatureMap {
-    var $_map;
-
-    /**
-     *    Creates an empty call map.
-     *    @access public
-     */
-    function SimpleSignatureMap() {
-        $this->_map = array();
-    }
-
-    /**
-     *    Stashes a reference against a method call.
-     *    @param array $parameters    Array of arguments (including wildcards).
-     *    @param mixed $action        Reference placed in the map.
-     *    @access public
-     */
-    function add($parameters, &$action) {
-        $place = count($this->_map);
-        $this->_map[$place] = array();
-        $this->_map[$place]['params'] = new ParametersExpectation($parameters);
-        $this->_map[$place]['content'] = &$action;
-    }
-
-    /**
-     *    Searches the call list for a matching parameter
-     *    set. Returned by reference.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return object              Object held in the first matching
-     *                                slot, otherwise null.
-     *    @access public
-     */
-    function &findFirstAction($parameters) {
-        $slot = $this->_findFirstSlot($parameters);
-        if (isset($slot) && isset($slot['content'])) {
-            return $slot['content'];
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Searches the call list for a matching parameter
-     *    set. True if successful.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return boolean             True if a match is present.
-     *    @access public
-     */
-    function isMatch($parameters) {
-        return ($this->_findFirstSlot($parameters) != null);
-    }
-
-    /**
-     *    Compares the incoming parameters with the
-     *    internal expectation. Uses the incoming $test
-     *    to dispatch the test message.
-     *    @param SimpleTestCase $test   Test to dispatch to.
-     *    @param array $parameters      The actual calling arguments.
-     *    @param string $message        The message to overlay.
-     *    @access public
-     */
-    function test(&$test, $parameters, $message) {
-    }
-
-    /**
-     *    Searches the map for a matching item.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return array               Reference to slot or null.
-     *    @access private
-     */
-    function &_findFirstSlot($parameters) {
-        $count = count($this->_map);
-        for ($i = 0; $i < $count; $i++) {
-            if ($this->_map[$i]["params"]->test($parameters)) {
-                return $this->_map[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-}
-
-/**
- *    Allows setting of actions against call signatures either
- *    at a specific time, or always. Specific time settings
- *    trump lasting ones, otherwise the most recently added
- *    will mask an earlier match.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleCallSchedule {
-    var $_wildcard = MOCK_ANYTHING;
-    var $_always;
-    var $_at;
-
-    /**
-     *    Sets up an empty response schedule.
-     *    Creates an empty call map.
-     */
-    function SimpleCallSchedule() {
-        $this->_always = array();
-        $this->_at = array();
-    }
-
-    /**
-     *    Stores an action against a signature that
-     *    will always fire unless masked by a time
-     *    specific one.
-     *    @param string $method        Method name.
-     *    @param array $args           Calling parameters.
-     *    @param SimpleAction $action  Actually simpleByValue, etc.
-     *    @access public
-     */
-    function register($method, $args, &$action) {
-        $args = $this->_replaceWildcards($args);
-        $method = strtolower($method);
-        if (! isset($this->_always[$method])) {
-            $this->_always[$method] = new SimpleSignatureMap();
-        }
-        $this->_always[$method]->add($args, $action);
-    }
-
-    /**
-     *    Stores an action against a signature that
-     *    will fire at a specific time in the future.
-     *    @param integer $step         delay of calls to this method,
-     *                                 0 is next.
-     *    @param string $method        Method name.
-     *    @param array $args           Calling parameters.
-     *    @param SimpleAction $action  Actually SimpleByValue, etc.
-     *    @access public
-     */
-    function registerAt($step, $method, $args, &$action) {
-        $args = $this->_replaceWildcards($args);
-        $method = strtolower($method);
-        if (! isset($this->_at[$method])) {
-            $this->_at[$method] = array();
-        }
-        if (! isset($this->_at[$method][$step])) {
-            $this->_at[$method][$step] = new SimpleSignatureMap();
-        }
-        $this->_at[$method][$step]->add($args, $action);
-    }
-
-    function expectArguments($method, $args, $message) {
-        $args = $this->_replaceWildcards($args);
-        $message .= Mock::getExpectationLine();
-        $this->_expected_args[strtolower($method)] =
-                new ParametersExpectation($args, $message);
-
-    }
-
-    /**
-     *    Actually carry out the action stored previously,
-     *    if the parameters match.
-     *    @param integer $step      Time of call.
-     *    @param string $method     Method name.
-     *    @param array $args        The parameters making up the
-     *                              rest of the call.
-     *    @return mixed             The result of the action.
-     *    @access public
-     */
-    function &respond($step, $method, $args) {
-        $method = strtolower($method);
-        if (isset($this->_at[$method][$step])) {
-            if ($this->_at[$method][$step]->isMatch($args)) {
-                $action = &$this->_at[$method][$step]->findFirstAction($args);
-                if (isset($action)) {
-                    return $action->act();
-                }
-            }
-        }
-        if (isset($this->_always[$method])) {
-            $action = &$this->_always[$method]->findFirstAction($args);
-            if (isset($action)) {
-                return $action->act();
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Replaces wildcard matches with wildcard
-     *    expectations in the argument list.
-     *    @param array $args      Raw argument list.
-     *    @return array           Argument list with
-     *                            expectations.
-     *    @access private
-     */
-    function _replaceWildcards($args) {
-        if ($args === false) {
-            return false;
-        }
-        for ($i = 0; $i < count($args); $i++) {
-            if ($args[$i] === $this->_wildcard) {
-                $args[$i] = new AnythingExpectation();
-            }
-        }
-        return $args;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a reference for returning later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleByReference {
-    var $_reference;
-
-    /**
-     *    Stashes it for later.
-     *    @param mixed $reference     Actual PHP4 style reference.
-     *    @access public
-     */
-    function SimpleByReference(&$reference) {
-        $this->_reference = &$reference;
-    }
-
-    /**
-     *    Returns the reference stored earlier.
-     *    @return mixed    Whatever was stashed.
-     *    @access public
-     */
-    function &act() {
-        return $this->_reference;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a value for returning later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleByValue {
-    var $_value;
-
-    /**
-     *    Stashes it for later.
-     *    @param mixed $value     You need to clone objects
-     *                            if you want copy semantics
-     *                            for these.
-     *    @access public
-     */
-    function SimpleByValue($value) {
-        $this->_value = $value;
-    }
-
-    /**
-     *    Returns the value stored earlier.
-     *    @return mixed    Whatever was stashed.
-     *    @access public
-     */
-    function &act() {
-        $dummy = $this->_value;
-        return $dummy;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes an exception for throwing later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleThrower {
-    var $_exception;
-
-    /**
-     *    Stashes it for later.
-     *    @param Exception $exception    The exception object to throw.
-     *    @access public
-     */
-    function SimpleThrower($exception) {
-        $this->_exception = $exception;
-    }
-
-    /**
-     *    Throws the exceptins stashed earlier.
-     *    @access public
-     */
-    function act() {
-        eval('throw $this->_exception;');
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes an error for emitting later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleErrorThrower {
-    var $_error;
-    var $_severity;
-
-    /**
-     *    Stashes an error to throw later.
-     *    @param string $error      Error message.
-     *    @param integer $severity  PHP error constant, e.g E_USER_ERROR.
-     *    @access public
-     */
-    function SimpleErrorThrower($error, $severity) {
-        $this->_error = $error;
-        $this->_severity = $severity;
-    }
-
-    /**
-     *    Triggers the stashed error.
-     *    @return null        The usual PHP4.4 shenanigans are needed here.
-     *    @access public
-     */
-    function &act() {
-        trigger_error($this->_error, $this->_severity);
-        $null = null;
-        return $null;
-    }
-}
-
-/**
- *    A base class or delegate that extends an
- *    empty collection of methods that can have their
- *    return values set and expectations made of the
- *    calls upon them. The mock will assert the
- *    expectations against it's attached test case in
- *    addition to the server stub behaviour or returning
- *    preprogrammed responses.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleMock {
-    var $_actions;
-    var $_wildcard = MOCK_ANYTHING;
-    var $_is_strict = true;
-    var $_call_counts;
-    var $_expected_counts;
-    var $_max_counts;
-    var $_expected_args;
-    var $_expected_args_at;
-
-    /**
-     *    Creates an empty action list and expectation list.
-     *    All call counts are set to zero.
-     *    @access public
-     */
-    function SimpleMock() {
-        $this->_actions = &new SimpleCallSchedule();
-        $this->_expectations = &new SimpleCallSchedule();
-        $this->_call_counts = array();
-        $this->_expected_counts = array();
-        $this->_max_counts = array();
-        $this->_expected_args = array();
-        $this->_expected_args_at = array();
-        $test = &$this->_getCurrentTestCase();
-        $test->tell($this);
-    }
-
-    /**
-     *    Disables a name check when setting expectations.
-     *    This hack is needed for the partial mocks.
-     *    @access public
-     */
-    function disableExpectationNameChecks() {
-        $this->_is_strict = false;
-    }
-
-    /**
-     *    Finds currently running test.
-     *    @return SimpeTestCase    Current test case.
-     *    @access protected
-     */
-    function &_getCurrentTestCase() {
-        $context = &SimpleTest::getContext();
-        return $context->getTest();
-    }
-
-    /**
-     *    Die if bad arguments array is passed.
-     *    @param mixed $args     The arguments value to be checked.
-     *    @param string $task    Description of task attempt.
-     *    @return boolean        Valid arguments
-     *    @access private
-     */
-    function _checkArgumentsIsArray($args, $task) {
-        if (! is_array($args)) {
-            trigger_error(
-                "Cannot $task as \$args parameter is not an array",
-                E_USER_ERROR);
-        }
-    }
-
-    /**
-     *    Triggers a PHP error if the method is not part
-     *    of this object.
-     *    @param string $method        Name of method.
-     *    @param string $task          Description of task attempt.
-     *    @access protected
-     */
-    function _dieOnNoMethod($method, $task) {
-        if ($this->_is_strict && ! method_exists($this, $method)) {
-            trigger_error(
-                    "Cannot $task as no ${method}() in class " . get_class($this),
-                    E_USER_ERROR);
-        }
-    }
-
-    /**
-     *    Replaces wildcard matches with wildcard
-     *    expectations in the argument list.
-     *    @param array $args      Raw argument list.
-     *    @return array           Argument list with
-     *                            expectations.
-     *    @access private
-     */
-    function _replaceWildcards($args) {
-        if ($args === false) {
-            return false;
-        }
-        for ($i = 0; $i < count($args); $i++) {
-            if ($args[$i] === $this->_wildcard) {
-                $args[$i] = new AnythingExpectation();
-            }
-        }
-        return $args;
-    }
-
-    /**
-     *    Adds one to the call count of a method.
-     *    @param string $method        Method called.
-     *    @param array $args           Arguments as an array.
-     *    @access protected
-     */
-    function _addCall($method, $args) {
-        if (! isset($this->_call_counts[$method])) {
-            $this->_call_counts[$method] = 0;
-        }
-        $this->_call_counts[$method]++;
-    }
-
-    /**
-     *    Fetches the call count of a method so far.
-     *    @param string $method        Method name called.
-     *    @return integer              Number of calls so far.
-     *    @access public
-     */
-    function getCallCount($method) {
-        $this->_dieOnNoMethod($method, "get call count");
-        $method = strtolower($method);
-        if (! isset($this->_call_counts[$method])) {
-            return 0;
-        }
-        return $this->_call_counts[$method];
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value for all calls to this method.
-     *    @param string $method       Method name.
-     *    @param mixed $value         Result of call passed by value.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     *    @access public
-     */
-    function setReturnValue($method, $value, $args = false) {
-        $this->_dieOnNoMethod($method, "set return value");
-        $this->_actions->register($method, $args, new SimpleByValue($value));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value only when the required call count
-     *    is reached.
-     *    @param integer $timing   Number of calls in the future
-     *                             to which the result applies. If
-     *                             not set then all calls will return
-     *                             the value.
-     *    @param string $method    Method name.
-     *    @param mixed $value      Result of call passed by value.
-     *    @param array $args       List of parameters to match
-     *                             including wildcards.
-     *    @access public
-     */
-    function setReturnValueAt($timing, $method, $value, $args = false) {
-        $this->_dieOnNoMethod($method, "set return value sequence");
-        $this->_actions->registerAt($timing, $method, $args, new SimpleByValue($value));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by reference for all calls.
-     *    @param string $method       Method name.
-     *    @param mixed $reference     Result of the call will be this object.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     *    @access public
-     */
-    function setReturnReference($method, &$reference, $args = false) {
-        $this->_dieOnNoMethod($method, "set return reference");
-        $this->_actions->register($method, $args, new SimpleByReference($reference));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value only when the required call count
-     *    is reached.
-     *    @param integer $timing    Number of calls in the future
-     *                              to which the result applies. If
-     *                              not set then all calls will return
-     *                              the value.
-     *    @param string $method     Method name.
-     *    @param mixed $reference   Result of the call will be this object.
-     *    @param array $args        List of parameters to match
-     *                              including wildcards.
-     *    @access public
-     */
-    function setReturnReferenceAt($timing, $method, &$reference, $args = false) {
-        $this->_dieOnNoMethod($method, "set return reference sequence");
-        $this->_actions->registerAt($timing, $method, $args, new SimpleByReference($reference));
-    }
-
-    /**
-     *    Sets up an expected call with a set of
-     *    expected parameters in that call. All
-     *    calls will be compared to these expectations
-     *    regardless of when the call is made.
-     *    @param string $method        Method call to test.
-     *    @param array $args           Expected parameters for the call
-     *                                 including wildcards.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expect($method, $args, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set expected arguments');
-        $this->_checkArgumentsIsArray($args, 'set expected arguments');
-        $this->_expectations->expectArguments($method, $args, $message);
-        $args = $this->_replaceWildcards($args);
-        $message .= Mock::getExpectationLine();
-        $this->_expected_args[strtolower($method)] =
-                new ParametersExpectation($args, $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function expectArguments($method, $args, $message = '%s') {
-        return $this->expect($method, $args, $message);
-    }
-
-    /**
-     *    Sets up an expected call with a set of
-     *    expected parameters in that call. The
-     *    expected call count will be adjusted if it
-     *    is set too low to reach this call.
-     *    @param integer $timing    Number of calls in the future at
-     *                              which to test. Next call is 0.
-     *    @param string $method     Method call to test.
-     *    @param array $args        Expected parameters for the call
-     *                              including wildcards.
-     *    @param string $message    Overridden message.
-     *    @access public
-     */
-    function expectAt($timing, $method, $args, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set expected arguments at time');
-        $this->_checkArgumentsIsArray($args, 'set expected arguments at time');
-        $args = $this->_replaceWildcards($args);
-        if (! isset($this->_expected_args_at[$timing])) {
-            $this->_expected_args_at[$timing] = array();
-        }
-        $method = strtolower($method);
-        $message .= Mock::getExpectationLine();
-        $this->_expected_args_at[$timing][$method] =
-                new ParametersExpectation($args, $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function expectArgumentsAt($timing, $method, $args, $message = '%s') {
-        return $this->expectAt($timing, $method, $args, $message);
-    }
-
-    /**
-     *    Sets an expectation for the number of times
-     *    a method will be called. The tally method
-     *    is used to check this.
-     *    @param string $method        Method call to test.
-     *    @param integer $count        Number of times it should
-     *                                 have been called at tally.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expectCallCount($method, $count, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set expected call count');
-        $message .= Mock::getExpectationLine();
-        $this->_expected_counts[strtolower($method)] =
-                new CallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Sets the number of times a method may be called
-     *    before a test failure is triggered.
-     *    @param string $method        Method call to test.
-     *    @param integer $count        Most number of times it should
-     *                                 have been called.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expectMaximumCallCount($method, $count, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set maximum call count');
-        $message .= Mock::getExpectationLine();
-        $this->_max_counts[strtolower($method)] =
-                new MaximumCallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Sets the number of times to call a method to prevent
-     *    a failure on the tally.
-     *    @param string $method      Method call to test.
-     *    @param integer $count      Least number of times it should
-     *                               have been called.
-     *    @param string $message     Overridden message.
-     *    @access public
-     */
-    function expectMinimumCallCount($method, $count, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set minimum call count');
-        $message .= Mock::getExpectationLine();
-        $this->_expected_counts[strtolower($method)] =
-                new MinimumCallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Convenience method for barring a method
-     *    call.
-     *    @param string $method        Method call to ban.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expectNever($method, $message = '%s') {
-        $this->expectMaximumCallCount($method, 0, $message);
-    }
-
-    /**
-     *    Convenience method for a single method
-     *    call.
-     *    @param string $method     Method call to track.
-     *    @param array $args        Expected argument list or
-     *                              false for any arguments.
-     *    @param string $message    Overridden message.
-     *    @access public
-     */
-    function expectOnce($method, $args = false, $message = '%s') {
-        $this->expectCallCount($method, 1, $message);
-        if ($args !== false) {
-            $this->expect($method, $args, $message);
-        }
-    }
-
-    /**
-     *    Convenience method for requiring a method
-     *    call.
-     *    @param string $method       Method call to track.
-     *    @param array $args          Expected argument list or
-     *                                false for any arguments.
-     *    @param string $message      Overridden message.
-     *    @access public
-     */
-    function expectAtLeastOnce($method, $args = false, $message = '%s') {
-        $this->expectMinimumCallCount($method, 1, $message);
-        if ($args !== false) {
-            $this->expect($method, $args, $message);
-        }
-    }
-
-    /**
-     *    Sets up a trigger to throw an exception upon the
-     *    method call.
-     *    @param string $method     Method name to throw on.
-     */
-    function throwOn($method, $exception = false, $args = false) {
-        $this->_dieOnNoMethod($method, "throw on");
-        $this->_actions->register($method, $args,
-                new SimpleThrower($exception ? $exception : new Exception()));
-    }
-
-    /**
-     *    Sets up a trigger to throw an exception upon the
-     *    method call.
-     */
-    function throwAt($timing, $method, $exception = false, $args = false) {
-        $this->_dieOnNoMethod($method, "throw at");
-        $this->_actions->registerAt($timing, $method, $args,
-                new SimpleThrower($exception ? $exception : new Exception()));
-    }
-
-    /**
-     *    Sets up a trigger to throw an error upon the
-     *    method call.
-     */
-    function errorOn($method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
-        $this->_dieOnNoMethod($method, "error on");
-        $this->_actions->register($method, $args, new SimpleErrorThrower($error, $severity));
-    }
-
-    /**
-     *    Sets up a trigger to throw an error upon the
-     *    method call.
-     */
-    function errorAt($timing, $method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
-        $this->_dieOnNoMethod($method, "error at");
-        $this->_actions->registerAt($timing, $method, $args, new SimpleErrorThrower($error, $severity));
-    }
-
-    /**
-     *    @deprecated
-     */
-    function tally() {
-    }
-
-    /**
-     *    Receives event from unit test that the current
-     *    test method has finished. Totals up the call
-     *    counts and triggers a test assertion if a test
-     *    is present for expected call counts.
-     *    @param string $test_method      Current method name.
-     *    @param SimpleTestCase $test     Test to send message to.
-     *    @access public
-     */
-    function atTestEnd($test_method, &$test) {
-        foreach ($this->_expected_counts as $method => $expectation) {
-            $test->assert($expectation, $this->getCallCount($method));
-        }
-        foreach ($this->_max_counts as $method => $expectation) {
-            if ($expectation->test($this->getCallCount($method))) {
-                $test->assert($expectation, $this->getCallCount($method));
-            }
-        }
-    }
-
-    /**
-     *    Returns the expected value for the method name
-     *    and checks expectations. Will generate any
-     *    test assertions as a result of expectations
-     *    if there is a test present.
-     *    @param string $method       Name of method to simulate.
-     *    @param array $args          Arguments as an array.
-     *    @return mixed               Stored return.
-     *    @access private
-     */
-    function &_invoke($method, $args) {
-        $method = strtolower($method);
-        $step = $this->getCallCount($method);
-        $this->_addCall($method, $args);
-        $this->_checkExpectations($method, $args, $step);
-        $result = &$this->_emulateCall($method, $args, $step);
-        return $result;
-    }
-
-    /**
-     *    Finds the return value matching the incoming
-     *    arguments. If there is no matching value found
-     *    then an error is triggered.
-     *    @param string $method      Method name.
-     *    @param array $args         Calling arguments.
-     *    @param integer $step       Current position in the
-     *                               call history.
-     *    @return mixed              Stored return or other action.
-     *    @access protected
-     */
-    function &_emulateCall($method, $args, $step) {
-        return $this->_actions->respond($step, $method, $args);
-    }
-
-    /**
-     *    Tests the arguments against expectations.
-     *    @param string $method        Method to check.
-     *    @param array $args           Argument list to match.
-     *    @param integer $timing       The position of this call
-     *                                 in the call history.
-     *    @access private
-     */
-    function _checkExpectations($method, $args, $timing) {
-        $test = &$this->_getCurrentTestCase();
-        if (isset($this->_max_counts[$method])) {
-            if (! $this->_max_counts[$method]->test($timing + 1)) {
-                $test->assert($this->_max_counts[$method], $timing + 1);
-            }
-        }
-        if (isset($this->_expected_args_at[$timing][$method])) {
-            $test->assert(
-                    $this->_expected_args_at[$timing][$method],
-                    $args,
-                    "Mock method [$method] at [$timing] -> %s");
-        } elseif (isset($this->_expected_args[$method])) {
-            $test->assert(
-                    $this->_expected_args[$method],
-                    $args,
-                    "Mock method [$method] -> %s");
-        }
-    }
-}
-
-/**
- *    Static methods only service class for code generation of
- *    mock objects.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class Mock {
-
-    /**
-     *    Factory for mock object classes.
-     *    @access public
-     */
-    function Mock() {
-        trigger_error('Mock factory methods are static.');
-    }
-
-    /**
-     *    Clones a class' interface and creates a mock version
-     *    that can have return values and expectations set.
-     *    @param string $class         Class to clone.
-     *    @param string $mock_class    New class name. Default is
-     *                                 the old name with "Mock"
-     *                                 prepended.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in the cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     *    @static
-     *    @access public
-     */
-    function generate($class, $mock_class = false, $methods = false) {
-        $generator = new MockGenerator($class, $mock_class);
-        return $generator->generateSubclass($methods);
-    }
-
-    /**
-     *    Generates a version of a class with selected
-     *    methods mocked only. Inherits the old class
-     *    and chains the mock methods of an aggregated
-     *    mock object.
-     *    @param string $class            Class to clone.
-     *    @param string $mock_class       New class name.
-     *    @param array $methods           Methods to be overridden
-     *                                    with mock versions.
-     *    @static
-     *    @access public
-     */
-    function generatePartial($class, $mock_class, $methods) {
-        $generator = new MockGenerator($class, $mock_class);
-        return $generator->generatePartial($methods);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @access public
-     *    @static
-     */
-    function getExpectationLine() {
-        $trace = new SimpleStackTrace(array('expect'));
-        return $trace->traceMethod();
-    }
-}
-
-/**
- *    @package  SimpleTest
- *    @subpackage   MockObjects
- *    @deprecated
- */
-class Stub extends Mock {
-}
-
-/**
- *    Service class for code generation of mock objects.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class MockGenerator {
-    var $_class;
-    var $_mock_class;
-    var $_mock_base;
-    var $_reflection;
-
-    /**
-     *    Builds initial reflection object.
-     *    @param string $class        Class to be mocked.
-     *    @param string $mock_class   New class with identical interface,
-     *                                but no behaviour.
-     */
-    function MockGenerator($class, $mock_class) {
-        $this->_class = $class;
-        $this->_mock_class = $mock_class;
-        if (! $this->_mock_class) {
-            $this->_mock_class = 'Mock' . $this->_class;
-        }
-        $this->_mock_base = SimpleTest::getMockBaseClass();
-        $this->_reflection = new SimpleReflection($this->_class);
-    }
-
-    /**
-     *    Clones a class' interface and creates a mock version
-     *    that can have return values and expectations set.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in th cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     *    @access public
-     */
-    function generate($methods) {
-        if (! $this->_reflection->classOrInterfaceExists()) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->_mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            return false;
-        }
-        $code = $this->_createClassCode($methods ? $methods : array());
-        return eval("$code return \$code;");
-    }
-
-    /**
-     *    Subclasses a class and overrides every method with a mock one
-     *    that can have return values and expectations set. Chains
-     *    to an aggregated SimpleMock.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in the cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     *    @access public
-     */
-    function generateSubclass($methods) {
-        if (! $this->_reflection->classOrInterfaceExists()) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->_mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            return false;
-        }
-        if ($this->_reflection->isInterface() || $this->_reflection->hasFinal()) {
-            $code = $this->_createClassCode($methods ? $methods : array());
-            return eval("$code return \$code;");
-        } else {
-            $code = $this->_createSubclassCode($methods ? $methods : array());
-            return eval("$code return \$code;");
-        }
-    }
-
-    /**
-     *    Generates a version of a class with selected
-     *    methods mocked only. Inherits the old class
-     *    and chains the mock methods of an aggregated
-     *    mock object.
-     *    @param array $methods           Methods to be overridden
-     *                                    with mock versions.
-     *    @access public
-     */
-    function generatePartial($methods) {
-        if (! $this->_reflection->classExists($this->_class)) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->_mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            trigger_error('Partial mock class [' . $this->_mock_class . '] already exists');
-            return false;
-        }
-        $code = $this->_extendClassCode($methods);
-        return eval("$code return \$code;");
-    }
-
-    /**
-     *    The new mock class code as a string.
-     *    @param array $methods          Additional methods.
-     *    @return string                 Code for new mock class.
-     *    @access private
-     */
-    function _createClassCode($methods) {
-        $implements = '';
-        $interfaces = $this->_reflection->getInterfaces();
-        if (function_exists('spl_classes')) {
-            $interfaces = array_diff($interfaces, array('Traversable'));
-        }
-        if (count($interfaces) > 0) {
-            $implements = 'implements ' . implode(', ', $interfaces);
-        }
-        $code = "class " . $this->_mock_class . " extends " . $this->_mock_base . " $implements {\n";
-        $code .= "    function " . $this->_mock_class . "() {\n";
-        $code .= "        \$this->" . $this->_mock_base . "();\n";
-        $code .= "    }\n";
-        if (in_array('__construct', $this->_reflection->getMethods())) {
-            $code .= "    " . $this->_reflection->getSignature('__construct') . " {\n";
-            $code .= "        \$this->" . $this->_mock_base . "();\n";
-            $code .= "    }\n";
-        }
-        $code .= $this->_createHandlerCode($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    The new mock class code as a string. The mock will
-     *    be a subclass of the original mocked class.
-     *    @param array $methods          Additional methods.
-     *    @return string                 Code for new mock class.
-     *    @access private
-     */
-    function _createSubclassCode($methods) {
-        $code  = "class " . $this->_mock_class . " extends " . $this->_class . " {\n";
-        $code .= "    var \$_mock;\n";
-        $code .= $this->_addMethodList(array_merge($methods, $this->_reflection->getMethods()));
-        $code .= "\n";
-        $code .= "    function " . $this->_mock_class . "() {\n";
-        $code .= "        \$this->_mock = &new " . $this->_mock_base . "();\n";
-        $code .= "        \$this->_mock->disableExpectationNameChecks();\n";
-        $code .= "    }\n";
-        $code .= $this->_chainMockReturns();
-        $code .= $this->_chainMockExpectations();
-        $code .= $this->_chainThrowMethods();
-        $code .= $this->_overrideMethods($this->_reflection->getMethods());
-        $code .= $this->_createNewMethodCode($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    The extension class code as a string. The class
-     *    composites a mock object and chains mocked methods
-     *    to it.
-     *    @param array  $methods       Mocked methods.
-     *    @return string               Code for a new class.
-     *    @access private
-     */
-    function _extendClassCode($methods) {
-        $code  = "class " . $this->_mock_class . " extends " . $this->_class . " {\n";
-        $code .= "    var \$_mock;\n";
-        $code .= $this->_addMethodList($methods);
-        $code .= "\n";
-        $code .= "    function " . $this->_mock_class . "() {\n";
-        $code .= "        \$this->_mock = &new " . $this->_mock_base . "();\n";
-        $code .= "        \$this->_mock->disableExpectationNameChecks();\n";
-        $code .= "    }\n";
-        $code .= $this->_chainMockReturns();
-        $code .= $this->_chainMockExpectations();
-        $code .= $this->_chainThrowMethods();
-        $code .= $this->_overrideMethods($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    Creates code within a class to generate replaced
-     *    methods. All methods call the _invoke() handler
-     *    with the method name and the arguments in an
-     *    array.
-     *    @param array $methods    Additional methods.
-     *    @access private
-     */
-    function _createHandlerCode($methods) {
-        $code = '';
-        $methods = array_merge($methods, $this->_reflection->getMethods());
-        foreach ($methods as $method) {
-            if ($this->_isConstructor($method)) {
-                continue;
-            }
-            $mock_reflection = new SimpleReflection($this->_mock_base);
-            if (in_array($method, $mock_reflection->getMethods())) {
-                continue;
-            }
-            $code .= "    " . $this->_reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->_invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-
-    /**
-     *    Creates code within a class to generate a new
-     *    methods. All methods call the _invoke() handler
-     *    on the internal mock with the method name and
-     *    the arguments in an array.
-     *    @param array $methods    Additional methods.
-     *    @access private
-     */
-    function _createNewMethodCode($methods) {
-        $code = '';
-        foreach ($methods as $method) {
-            if ($this->_isConstructor($method)) {
-                continue;
-            }
-            $mock_reflection = new SimpleReflection($this->_mock_base);
-            if (in_array($method, $mock_reflection->getMethods())) {
-                continue;
-            }
-            $code .= "    " . $this->_reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->_mock->_invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-
-    /**
-     *    Tests to see if a special PHP method is about to
-     *    be stubbed by mistake.
-     *    @param string $method    Method name.
-     *    @return boolean          True if special.
-     *    @access private
-     */
-    function _isConstructor($method) {
-        return in_array(
-                strtolower($method),
-                array('__construct', '__destruct'));
-    }
-
-    /**
-     *    Creates a list of mocked methods for error checking.
-     *    @param array $methods       Mocked methods.
-     *    @return string              Code for a method list.
-     *    @access private
-     */
-    function _addMethodList($methods) {
-        return "    var \$_mocked_methods = array('" .
-                implode("', '", array_map('strtolower', $methods)) .
-                "');\n";
-    }
-
-    /**
-     *    Creates code to abandon the expectation if not mocked.
-     *    @param string $alias       Parameter name of method name.
-     *    @return string             Code for bail out.
-     *    @access private
-     */
-    function _bailOutIfNotMocked($alias) {
-        $code  = "        if (! in_array(strtolower($alias), \$this->_mocked_methods)) {\n";
-        $code .= "            trigger_error(\"Method [$alias] is not mocked\");\n";
-        $code .= "            \$null = null;\n";
-        $code .= "            return \$null;\n";
-        $code .= "        }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code for chaining to the composited
-     *    mock object.
-     *    @return string           Code for mock set up.
-     *    @access private
-     */
-    function _chainMockReturns() {
-        $code  = "    function setReturnValue(\$method, \$value, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnValue(\$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnReference(\$method, &\$ref, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnReference(\$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code for chaining to an aggregated
-     *    mock object.
-     *    @return string                 Code for expectations.
-     *    @access private
-     */
-    function _chainMockExpectations() {
-        $code  = "    function expect(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expect(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectArguments(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectArguments(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectArgumentsAt(\$timing, \$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectArgumentsAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectArgumentsAt(\$timing, \$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectCallCount(\$method, \$count) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectNever(\$method) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectNever(\$method);\n";
-        $code .= "    }\n";
-        $code .= "    function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectOnce(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function tally() {\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Adds code for chaining the throw methods.
-     *    @return string           Code for chains.
-     *    @access private
-     */
-    function _chainThrowMethods() {
-        $code  = "    function throwOn(\$method, \$exception = false, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->throwOn(\$method, \$exception, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->errorOn(\$method, \$error, \$args, \$severity);\n";
-        $code .= "    }\n";
-        $code .= "    function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code to override a list of methods
-     *    with mock versions.
-     *    @param array $methods    Methods to be overridden
-     *                             with mock versions.
-     *    @return string           Code for overridden chains.
-     *    @access private
-     */
-    function _overrideMethods($methods) {
-        $code = "";
-        foreach ($methods as $method) {
-            if ($this->_isConstructor($method)) {
-                continue;
-            }
-            $code .= "    " . $this->_reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->_mock->_invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-}
-?>
diff --git a/tests/simpletest/page.php b/tests/simpletest/page.php
deleted file mode 100755
index 24dab13e04..0000000000
--- a/tests/simpletest/page.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: page.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
-    *   include other SimpleTest class files
-    */
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/parser.php');
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/form.php');
-require_once(dirname(__FILE__) . '/selector.php');
-/**#@-*/
-
-/**
- *    Creates tags and widgets given HTML tag
- *    attributes.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTagBuilder {
-
-    /**
-     *    Factory for the tag objects. Creates the
-     *    appropriate tag object for the incoming tag name
-     *    and attributes.
-     *    @param string $name        HTML tag name.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access public
-     */
-    function createTag($name, $attributes) {
-        static $map = array(
-                'a' => 'SimpleAnchorTag',
-                'title' => 'SimpleTitleTag',
-                'base' => 'SimpleBaseTag',
-                'button' => 'SimpleButtonTag',
-                'textarea' => 'SimpleTextAreaTag',
-                'option' => 'SimpleOptionTag',
-                'label' => 'SimpleLabelTag',
-                'form' => 'SimpleFormTag',
-                'frame' => 'SimpleFrameTag');
-        $attributes = $this->_keysToLowerCase($attributes);
-        if (array_key_exists($name, $map)) {
-            $tag_class = $map[$name];
-            return new $tag_class($attributes);
-        } elseif ($name == 'select') {
-            return $this->_createSelectionTag($attributes);
-        } elseif ($name == 'input') {
-            return $this->_createInputTag($attributes);
-        }
-        return new SimpleTag($name, $attributes);
-    }
-
-    /**
-     *    Factory for selection fields.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access protected
-     */
-    function _createSelectionTag($attributes) {
-        if (isset($attributes['multiple'])) {
-            return new MultipleSelectionTag($attributes);
-        }
-        return new SimpleSelectionTag($attributes);
-    }
-
-    /**
-     *    Factory for input tags.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access protected
-     */
-    function _createInputTag($attributes) {
-        if (! isset($attributes['type'])) {
-            return new SimpleTextTag($attributes);
-        }
-        $type = strtolower(trim($attributes['type']));
-        $map = array(
-                'submit' => 'SimpleSubmitTag',
-                'image' => 'SimpleImageSubmitTag',
-                'checkbox' => 'SimpleCheckboxTag',
-                'radio' => 'SimpleRadioButtonTag',
-                'text' => 'SimpleTextTag',
-                'hidden' => 'SimpleTextTag',
-                'password' => 'SimpleTextTag',
-                'file' => 'SimpleUploadTag');
-        if (array_key_exists($type, $map)) {
-            $tag_class = $map[$type];
-            return new $tag_class($attributes);
-        }
-        return false;
-    }
-
-    /**
-     *    Make the keys lower case for case insensitive look-ups.
-     *    @param hash $map   Hash to convert.
-     *    @return hash       Unchanged values, but keys lower case.
-     *    @access private
-     */
-    function _keysToLowerCase($map) {
-        $lower = array();
-        foreach ($map as $key => $value) {
-            $lower[strtolower($key)] = $value;
-        }
-        return $lower;
-    }
-}
-
-/**
- *    SAX event handler. Maintains a list of
- *    open tags and dispatches them as they close.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePageBuilder extends SimpleSaxListener {
-    var $_tags;
-    var $_page;
-    var $_private_content_tag;
-
-    /**
-     *    Sets the builder up empty.
-     *    @access public
-     */
-    function SimplePageBuilder() {
-        $this->SimpleSaxListener();
-    }
-
-    /**
-     *    Frees up any references so as to allow the PHP garbage
-     *    collection from unset() to work.
-     *    @access public
-     */
-    function free() {
-        unset($this->_tags);
-        unset($this->_page);
-        unset($this->_private_content_tags);
-    }
-
-    /**
-     *    Reads the raw content and send events
-     *    into the page to be built.
-     *    @param $response SimpleHttpResponse  Fetched response.
-     *    @return SimplePage                   Newly parsed page.
-     *    @access public
-     */
-    function &parse($response) {
-        $this->_tags = array();
-        $this->_page = &$this->_createPage($response);
-        $parser = &$this->_createParser($this);
-        $parser->parse($response->getContent());
-        $this->_page->acceptPageEnd();
-        return $this->_page;
-    }
-
-    /**
-     *    Creates an empty page.
-     *    @return SimplePage        New unparsed page.
-     *    @access protected
-     */
-    function &_createPage($response) {
-        $page = &new SimplePage($response);
-        return $page;
-    }
-
-    /**
-     *    Creates the parser used with the builder.
-     *    @param $listener SimpleSaxListener   Target of parser.
-     *    @return SimpleSaxParser              Parser to generate
-     *                                         events for the builder.
-     *    @access protected
-     */
-    function &_createParser(&$listener) {
-        $parser = &new SimpleHtmlSaxParser($listener);
-        return $parser;
-    }
-
-    /**
-     *    Start of element event. Opens a new tag.
-     *    @param string $name         Element name.
-     *    @param hash $attributes     Attributes without content
-     *                                are marked as true.
-     *    @return boolean             False on parse error.
-     *    @access public
-     */
-    function startElement($name, $attributes) {
-        $factory = &new SimpleTagBuilder();
-        $tag = $factory->createTag($name, $attributes);
-        if (! $tag) {
-            return true;
-        }
-        if ($tag->getTagName() == 'label') {
-            $this->_page->acceptLabelStart($tag);
-            $this->_openTag($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'form') {
-            $this->_page->acceptFormStart($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'frameset') {
-            $this->_page->acceptFramesetStart($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'frame') {
-            $this->_page->acceptFrame($tag);
-            return true;
-        }
-        if ($tag->isPrivateContent() && ! isset($this->_private_content_tag)) {
-            $this->_private_content_tag = &$tag;
-        }
-        if ($tag->expectEndTag()) {
-            $this->_openTag($tag);
-            return true;
-        }
-        $this->_page->acceptTag($tag);
-        return true;
-    }
-
-    /**
-     *    End of element event.
-     *    @param string $name        Element name.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function endElement($name) {
-        if ($name == 'label') {
-            $this->_page->acceptLabelEnd();
-            return true;
-        }
-        if ($name == 'form') {
-            $this->_page->acceptFormEnd();
-            return true;
-        }
-        if ($name == 'frameset') {
-            $this->_page->acceptFramesetEnd();
-            return true;
-        }
-        if ($this->_hasNamedTagOnOpenTagStack($name)) {
-            $tag = array_pop($this->_tags[$name]);
-            if ($tag->isPrivateContent() && $this->_private_content_tag->getTagName() == $name) {
-                unset($this->_private_content_tag);
-            }
-            $this->_addContentTagToOpenTags($tag);
-            $this->_page->acceptTag($tag);
-            return true;
-        }
-        return true;
-    }
-
-    /**
-     *    Test to see if there are any open tags awaiting
-     *    closure that match the tag name.
-     *    @param string $name        Element name.
-     *    @return boolean            True if any are still open.
-     *    @access private
-     */
-    function _hasNamedTagOnOpenTagStack($name) {
-        return isset($this->_tags[$name]) && (count($this->_tags[$name]) > 0);
-    }
-
-    /**
-     *    Unparsed, but relevant data. The data is added
-     *    to every open tag.
-     *    @param string $text        May include unparsed tags.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function addContent($text) {
-        if (isset($this->_private_content_tag)) {
-            $this->_private_content_tag->addContent($text);
-        } else {
-            $this->_addContentToAllOpenTags($text);
-        }
-        return true;
-    }
-
-    /**
-     *    Any content fills all currently open tags unless it
-     *    is part of an option tag.
-     *    @param string $text        May include unparsed tags.
-     *    @access private
-     */
-    function _addContentToAllOpenTags($text) {
-        foreach (array_keys($this->_tags) as $name) {
-            for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
-                $this->_tags[$name][$i]->addContent($text);
-            }
-        }
-    }
-
-    /**
-     *    Parsed data in tag form. The parsed tag is added
-     *    to every open tag. Used for adding options to select
-     *    fields only.
-     *    @param SimpleTag $tag        Option tags only.
-     *    @access private
-     */
-    function _addContentTagToOpenTags(&$tag) {
-        if ($tag->getTagName() != 'option') {
-            return;
-        }
-        foreach (array_keys($this->_tags) as $name) {
-            for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
-                $this->_tags[$name][$i]->addTag($tag);
-            }
-        }
-    }
-
-    /**
-     *    Opens a tag for receiving content. Multiple tags
-     *    will be receiving input at the same time.
-     *    @param SimpleTag $tag        New content tag.
-     *    @access private
-     */
-    function _openTag(&$tag) {
-        $name = $tag->getTagName();
-        if (! in_array($name, array_keys($this->_tags))) {
-            $this->_tags[$name] = array();
-        }
-        $this->_tags[$name][] = &$tag;
-    }
-}
-
-/**
- *    A wrapper for a web page.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePage {
-    var $_links;
-    var $_title;
-    var $_last_widget;
-    var $_label;
-    var $_left_over_labels;
-    var $_open_forms;
-    var $_complete_forms;
-    var $_frameset;
-    var $_frames;
-    var $_frameset_nesting_level;
-    var $_transport_error;
-    var $_raw;
-    var $_text;
-    var $_sent;
-    var $_headers;
-    var $_method;
-    var $_url;
-    var $_base = false;
-    var $_request_data;
-
-    /**
-     *    Parses a page ready to access it's contents.
-     *    @param SimpleHttpResponse $response     Result of HTTP fetch.
-     *    @access public
-     */
-    function SimplePage($response = false) {
-        $this->_links = array();
-        $this->_title = false;
-        $this->_left_over_labels = array();
-        $this->_open_forms = array();
-        $this->_complete_forms = array();
-        $this->_frameset = false;
-        $this->_frames = array();
-        $this->_frameset_nesting_level = 0;
-        $this->_text = false;
-        if ($response) {
-            $this->_extractResponse($response);
-        } else {
-            $this->_noResponse();
-        }
-    }
-
-    /**
-     *    Extracts all of the response information.
-     *    @param SimpleHttpResponse $response    Response being parsed.
-     *    @access private
-     */
-    function _extractResponse($response) {
-        $this->_transport_error = $response->getError();
-        $this->_raw = $response->getContent();
-        $this->_sent = $response->getSent();
-        $this->_headers = $response->getHeaders();
-        $this->_method = $response->getMethod();
-        $this->_url = $response->getUrl();
-        $this->_request_data = $response->getRequestData();
-    }
-
-    /**
-     *    Sets up a missing response.
-     *    @access private
-     */
-    function _noResponse() {
-        $this->_transport_error = 'No page fetched yet';
-        $this->_raw = false;
-        $this->_sent = false;
-        $this->_headers = false;
-        $this->_method = 'GET';
-        $this->_url = false;
-        $this->_request_data = false;
-    }
-
-    /**
-     *    Original request as bytes sent down the wire.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequest() {
-        return $this->_sent;
-    }
-
-    /**
-     *    Accessor for raw text of page.
-     *    @return string        Raw unparsed content.
-     *    @access public
-     */
-    function getRaw() {
-        return $this->_raw;
-    }
-
-    /**
-     *    Accessor for plain text of page as a text browser
-     *    would see it.
-     *    @return string        Plain text of page.
-     *    @access public
-     */
-    function getText() {
-        if (! $this->_text) {
-            $this->_text = SimpleHtmlSaxParser::normalise($this->_raw);
-        }
-        return $this->_text;
-    }
-
-    /**
-     *    Accessor for raw headers of page.
-     *    @return string       Header block as text.
-     *    @access public
-     */
-    function getHeaders() {
-        if ($this->_headers) {
-            return $this->_headers->getRaw();
-        }
-        return false;
-    }
-
-    /**
-     *    Original request method.
-     *    @return string        GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return $this->_method;
-    }
-
-    /**
-     *    Original resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     *    Base URL if set via BASE tag page url otherwise
-     *    @return SimpleUrl        Base url.
-     *    @access public
-     */
-    function getBaseUrl() {
-        return $this->_base;
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        return $this->_request_data;
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->_transport_error;
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        if ($this->_headers) {
-            return $this->_headers->getMimeType();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for HTTP response code.
-     *    @return integer    HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        if ($this->_headers) {
-            return $this->_headers->getResponseCode();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        if ($this->_headers) {
-            return $this->_headers->getAuthentication();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        if ($this->_headers) {
-            return $this->_headers->getRealm();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false as no frames.
-     *    @return array    Always empty.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return array();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           Always false.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return false;
-    }
-
-    /**
-     *    Sets the focus by name. Always fails for a leaf page.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        False as no frames.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return false;
-    }
-
-    /**
-     *    Clears the frame focus. Does nothing for a leaf page.
-     *    @access public
-     */
-    function clearFrameFocus() {
-    }
-
-    /**
-     *    Adds a tag to the page.
-     *    @param SimpleTag $tag        Tag to accept.
-     *    @access public
-     */
-    function acceptTag(&$tag) {
-        if ($tag->getTagName() == "a") {
-            $this->_addLink($tag);
-        } elseif ($tag->getTagName() == "base") {
-            $this->_setBase($tag);
-        } elseif ($tag->getTagName() == "title") {
-            $this->_setTitle($tag);
-        } elseif ($this->_isFormElement($tag->getTagName())) {
-            for ($i = 0; $i < count($this->_open_forms); $i++) {
-                $this->_open_forms[$i]->addWidget($tag);
-            }
-            $this->_last_widget = &$tag;
-        }
-    }
-
-    /**
-     *    Opens a label for a described widget.
-     *    @param SimpleFormTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptLabelStart(&$tag) {
-        $this->_label = &$tag;
-        unset($this->_last_widget);
-    }
-
-    /**
-     *    Closes the most recently opened label.
-     *    @access public
-     */
-    function acceptLabelEnd() {
-        if (isset($this->_label)) {
-            if (isset($this->_last_widget)) {
-                $this->_last_widget->setLabel($this->_label->getText());
-                unset($this->_last_widget);
-            } else {
-                $this->_left_over_labels[] = SimpleTestCompatibility::copy($this->_label);
-            }
-            unset($this->_label);
-        }
-    }
-
-    /**
-     *    Tests to see if a tag is a possible form
-     *    element.
-     *    @param string $name     HTML element name.
-     *    @return boolean         True if form element.
-     *    @access private
-     */
-    function _isFormElement($name) {
-        return in_array($name, array('input', 'button', 'textarea', 'select'));
-    }
-
-    /**
-     *    Opens a form. New widgets go here.
-     *    @param SimpleFormTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptFormStart(&$tag) {
-        $this->_open_forms[] = &new SimpleForm($tag, $this);
-    }
-
-    /**
-     *    Closes the most recently opened form.
-     *    @access public
-     */
-    function acceptFormEnd() {
-        if (count($this->_open_forms)) {
-            $this->_complete_forms[] = array_pop($this->_open_forms);
-        }
-    }
-
-    /**
-     *    Opens a frameset. A frameset may contain nested
-     *    frameset tags.
-     *    @param SimpleFramesetTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptFramesetStart(&$tag) {
-        if (! $this->_isLoadingFrames()) {
-            $this->_frameset = &$tag;
-        }
-        $this->_frameset_nesting_level++;
-    }
-
-    /**
-     *    Closes the most recently opened frameset.
-     *    @access public
-     */
-    function acceptFramesetEnd() {
-        if ($this->_isLoadingFrames()) {
-            $this->_frameset_nesting_level--;
-        }
-    }
-
-    /**
-     *    Takes a single frame tag and stashes it in
-     *    the current frame set.
-     *    @param SimpleFrameTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptFrame(&$tag) {
-        if ($this->_isLoadingFrames()) {
-            if ($tag->getAttribute('src')) {
-                $this->_frames[] = &$tag;
-            }
-        }
-    }
-
-    /**
-     *    Test to see if in the middle of reading
-     *    a frameset.
-     *    @return boolean        True if inframeset.
-     *    @access private
-     */
-    function _isLoadingFrames() {
-        if (! $this->_frameset) {
-            return false;
-        }
-        return ($this->_frameset_nesting_level > 0);
-    }
-
-    /**
-     *    Test to see if link is an absolute one.
-     *    @param string $url     Url to test.
-     *    @return boolean        True if absolute.
-     *    @access protected
-     */
-    function _linkIsAbsolute($url) {
-        $parsed = new SimpleUrl($url);
-        return (boolean)($parsed->getScheme() && $parsed->getHost());
-    }
-
-    /**
-     *    Adds a link to the page.
-     *    @param SimpleAnchorTag $tag      Link to accept.
-     *    @access protected
-     */
-    function _addLink($tag) {
-        $this->_links[] = $tag;
-    }
-
-    /**
-     *    Marker for end of complete page. Any work in
-     *    progress can now be closed.
-     *    @access public
-     */
-    function acceptPageEnd() {
-        while (count($this->_open_forms)) {
-            $this->_complete_forms[] = array_pop($this->_open_forms);
-        }
-        foreach ($this->_left_over_labels as $label) {
-            for ($i = 0, $count = count($this->_complete_forms); $i < $count; $i++) {
-                $this->_complete_forms[$i]->attachLabelBySelector(
-                        new SimpleById($label->getFor()),
-                        $label->getText());
-            }
-        }
-    }
-
-    /**
-     *    Test for the presence of a frameset.
-     *    @return boolean        True if frameset.
-     *    @access public
-     */
-    function hasFrames() {
-        return (boolean)$this->_frameset;
-    }
-
-    /**
-     *    Accessor for frame name and source URL for every frame that
-     *    will need to be loaded. Immediate children only.
-     *    @return boolean/array     False if no frameset or
-     *                              otherwise a hash of frame URLs.
-     *                              The key is either a numerical
-     *                              base one index or the name attribute.
-     *    @access public
-     */
-    function getFrameset() {
-        if (! $this->_frameset) {
-            return false;
-        }
-        $urls = array();
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $name = $this->_frames[$i]->getAttribute('name');
-            $url = new SimpleUrl($this->_frames[$i]->getAttribute('src'));
-            $urls[$name ? $name : $i + 1] = $this->expandUrl($url);
-        }
-        return $urls;
-    }
-
-    /**
-     *    Fetches a list of loaded frames.
-     *    @return array/string    Just the URL for a single page.
-     *    @access public
-     */
-    function getFrames() {
-        $url = $this->expandUrl($this->getUrl());
-        return $url->asString();
-    }
-
-    /**
-     *    Accessor for a list of all links.
-     *    @return array   List of urls with scheme of
-     *                    http or https and hostname.
-     *    @access public
-     */
-    function getUrls() {
-        $all = array();
-        foreach ($this->_links as $link) {
-            $url = $this->_getUrlFromLink($link);
-            $all[] = $url->asString();
-        }
-        return $all;
-    }
-
-    /**
-     *    Accessor for URLs by the link label. Label will match
-     *    regardess of whitespace issues and case.
-     *    @param string $label    Text of link.
-     *    @return array           List of links with that label.
-     *    @access public
-     */
-    function getUrlsByLabel($label) {
-        $matches = array();
-        foreach ($this->_links as $link) {
-            if ($link->getText() == $label) {
-                $matches[] = $this->_getUrlFromLink($link);
-            }
-        }
-        return $matches;
-    }
-
-    /**
-     *    Accessor for a URL by the id attribute.
-     *    @param string $id       Id attribute of link.
-     *    @return SimpleUrl       URL with that id of false if none.
-     *    @access public
-     */
-    function getUrlById($id) {
-        foreach ($this->_links as $link) {
-            if ($link->getAttribute('id') === (string)$id) {
-                return $this->_getUrlFromLink($link);
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Converts a link tag into a target URL.
-     *    @param SimpleAnchor $link    Parsed link.
-     *    @return SimpleUrl            URL with frame target if any.
-     *    @access private
-     */
-    function _getUrlFromLink($link) {
-        $url = $this->expandUrl($link->getHref());
-        if ($link->getAttribute('target')) {
-            $url->setTarget($link->getAttribute('target'));
-        }
-        return $url;
-    }
-
-    /**
-     *    Expands expandomatic URLs into fully qualified
-     *    URLs.
-     *    @param SimpleUrl $url        Relative URL.
-     *    @return SimpleUrl            Absolute URL.
-     *    @access public
-     */
-    function expandUrl($url) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        $location = $this->getBaseUrl() ? $this->getBaseUrl() : new SimpleUrl();
-        return $url->makeAbsolute($location->makeAbsolute($this->getUrl()));
-    }
-
-    /**
-     *    Sets the base url for the page.
-     *    @param SimpleTag $tag    Base URL for page.
-     *    @access protected
-     */
-    function _setBase(&$tag) {
-        $url = $tag->getAttribute('href');
-        $this->_base = new SimpleUrl($url);
-    }
-
-    /**
-     *    Sets the title tag contents.
-     *    @param SimpleTitleTag $tag    Title of page.
-     *    @access protected
-     */
-    function _setTitle(&$tag) {
-        $this->_title = &$tag;
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        if ($this->_title) {
-            return $this->_title->getText();
-        }
-        return false;
-    }
-
-    /**
-     *    Finds a held form by button label. Will only
-     *    search correctly built forms.
-     *    @param SimpleSelector $selector       Button finder.
-     *    @return SimpleForm                    Form object containing
-     *                                          the button.
-     *    @access public
-     */
-    function &getFormBySubmit($selector) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->hasSubmit($selector)) {
-                return $this->_complete_forms[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a held form by image using a selector.
-     *    Will only search correctly built forms.
-     *    @param SimpleSelector $selector  Image finder.
-     *    @return SimpleForm               Form object containing
-     *                                     the image.
-     *    @access public
-     */
-    function &getFormByImage($selector) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->hasImage($selector)) {
-                return $this->_complete_forms[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a held form by the form ID. A way of
-     *    identifying a specific form when we have control
-     *    of the HTML code.
-     *    @param string $id     Form label.
-     *    @return SimpleForm    Form object containing the matching ID.
-     *    @access public
-     */
-    function &getFormById($id) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->getId() == $id) {
-                return $this->_complete_forms[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Sets a field on each form in which the field is
-     *    available.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @param string $value               Value to set field to.
-     *    @return boolean                    True if value is valid.
-     *    @access public
-     */
-    function setField($selector, $value, $position=false) {
-        $is_set = false;
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->setField($selector, $value, $position)) {
-                $is_set = true;
-            }
-        }
-        return $is_set;
-    }
-
-    /**
-     *    Accessor for a form element value within a page.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @return string/boolean             A string if the field is
-     *                                       present, false if unchecked
-     *                                       and null if missing.
-     *    @access public
-     */
-    function getField($selector) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            $value = $this->_complete_forms[$i]->getValue($selector);
-            if (isset($value)) {
-                return $value;
-            }
-        }
-        return null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/parser.php b/tests/simpletest/parser.php
deleted file mode 100755
index 89d32869aa..0000000000
--- a/tests/simpletest/parser.php
+++ /dev/null
@@ -1,765 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: parser.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * Lexer mode stack constants
- */
-foreach (array('LEXER_ENTER', 'LEXER_MATCHED',
-                'LEXER_UNMATCHED', 'LEXER_EXIT',
-                'LEXER_SPECIAL') as $i => $constant) {
-    if (! defined($constant)) {
-        define($constant, $i + 1);
-    }
-}
-/**#@-*/
-
-/**
- *    Compounded regular expression. Any of
- *    the contained patterns could match and
- *    when one does, it's label is returned.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class ParallelRegex {
-    var $_patterns;
-    var $_labels;
-    var $_regex;
-    var $_case;
-
-    /**
-     *    Constructor. Starts with no patterns.
-     *    @param boolean $case    True for case sensitive, false
-     *                            for insensitive.
-     *    @access public
-     */
-    function ParallelRegex($case) {
-        $this->_case = $case;
-        $this->_patterns = array();
-        $this->_labels = array();
-        $this->_regex = null;
-    }
-
-    /**
-     *    Adds a pattern with an optional label.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $label        Label of regex to be returned
-     *                                on a match.
-     *    @access public
-     */
-    function addPattern($pattern, $label = true) {
-        $count = count($this->_patterns);
-        $this->_patterns[$count] = $pattern;
-        $this->_labels[$count] = $label;
-        $this->_regex = null;
-    }
-
-    /**
-     *    Attempts to match all patterns at once against
-     *    a string.
-     *    @param string $subject      String to match against.
-     *    @param string $match        First matched portion of
-     *                                subject.
-     *    @return boolean             True on success.
-     *    @access public
-     */
-    function match($subject, &$match) {
-        if (count($this->_patterns) == 0) {
-            return false;
-        }
-        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
-            $match = '';
-            return false;
-        }
-        $match = $matches[0];
-        for ($i = 1; $i < count($matches); $i++) {
-            if ($matches[$i]) {
-                return $this->_labels[$i - 1];
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Compounds the patterns into a single
-     *    regular expression separated with the
-     *    "or" operator. Caches the regex.
-     *    Will automatically escape (, ) and / tokens.
-     *    @param array $patterns    List of patterns in order.
-     *    @access private
-     */
-    function _getCompoundedRegex() {
-        if ($this->_regex == null) {
-            for ($i = 0, $count = count($this->_patterns); $i < $count; $i++) {
-                $this->_patterns[$i] = '(' . str_replace(
-                        array('/', '(', ')'),
-                        array('\/', '\(', '\)'),
-                        $this->_patterns[$i]) . ')';
-            }
-            $this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
-        }
-        return $this->_regex;
-    }
-
-    /**
-     *    Accessor for perl regex mode flags to use.
-     *    @return string       Perl regex flags.
-     *    @access private
-     */
-    function _getPerlMatchingFlags() {
-        return ($this->_case ? "msS" : "msSi");
-    }
-}
-
-/**
- *    States for a stack machine.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleStateStack {
-    var $_stack;
-
-    /**
-     *    Constructor. Starts in named state.
-     *    @param string $start        Starting state name.
-     *    @access public
-     */
-    function SimpleStateStack($start) {
-        $this->_stack = array($start);
-    }
-
-    /**
-     *    Accessor for current state.
-     *    @return string       State.
-     *    @access public
-     */
-    function getCurrent() {
-        return $this->_stack[count($this->_stack) - 1];
-    }
-
-    /**
-     *    Adds a state to the stack and sets it
-     *    to be the current state.
-     *    @param string $state        New state.
-     *    @access public
-     */
-    function enter($state) {
-        array_push($this->_stack, $state);
-    }
-
-    /**
-     *    Leaves the current state and reverts
-     *    to the previous one.
-     *    @return boolean    False if we drop off
-     *                       the bottom of the list.
-     *    @access public
-     */
-    function leave() {
-        if (count($this->_stack) == 1) {
-            return false;
-        }
-        array_pop($this->_stack);
-        return true;
-    }
-}
-
-/**
- *    Accepts text and breaks it into tokens.
- *    Some optimisation to make the sure the
- *    content is only scanned by the PHP regex
- *    parser once. Lexer modes must not start
- *    with leading underscores.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleLexer {
-    var $_regexes;
-    var $_parser;
-    var $_mode;
-    var $_mode_handlers;
-    var $_case;
-
-    /**
-     *    Sets up the lexer in case insensitive matching
-     *    by default.
-     *    @param SimpleSaxParser $parser  Handling strategy by
-     *                                    reference.
-     *    @param string $start            Starting handler.
-     *    @param boolean $case            True for case sensitive.
-     *    @access public
-     */
-    function SimpleLexer(&$parser, $start = "accept", $case = false) {
-        $this->_case = $case;
-        $this->_regexes = array();
-        $this->_parser = &$parser;
-        $this->_mode = &new SimpleStateStack($start);
-        $this->_mode_handlers = array($start => $start);
-    }
-
-    /**
-     *    Adds a token search pattern for a particular
-     *    parsing mode. The pattern does not change the
-     *    current mode.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @access public
-     */
-    function addPattern($pattern, $mode = "accept") {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern);
-        if (! isset($this->_mode_handlers[$mode])) {
-            $this->_mode_handlers[$mode] = $mode;
-        }
-    }
-
-    /**
-     *    Adds a pattern that will enter a new parsing
-     *    mode. Useful for entering parenthesis, strings,
-     *    tags, etc.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @param string $new_mode     Change parsing to this new
-     *                                nested mode.
-     *    @access public
-     */
-    function addEntryPattern($pattern, $mode, $new_mode) {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern, $new_mode);
-        if (! isset($this->_mode_handlers[$new_mode])) {
-            $this->_mode_handlers[$new_mode] = $new_mode;
-        }
-    }
-
-    /**
-     *    Adds a pattern that will exit the current mode
-     *    and re-enter the previous one.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Mode to leave.
-     *    @access public
-     */
-    function addExitPattern($pattern, $mode) {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern, "__exit");
-        if (! isset($this->_mode_handlers[$mode])) {
-            $this->_mode_handlers[$mode] = $mode;
-        }
-    }
-
-    /**
-     *    Adds a pattern that has a special mode. Acts as an entry
-     *    and exit pattern in one go, effectively calling a special
-     *    parser handler for this token only.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @param string $special      Use this mode for this one token.
-     *    @access public
-     */
-    function addSpecialPattern($pattern, $mode, $special) {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern, "_$special");
-        if (! isset($this->_mode_handlers[$special])) {
-            $this->_mode_handlers[$special] = $special;
-        }
-    }
-
-    /**
-     *    Adds a mapping from a mode to another handler.
-     *    @param string $mode        Mode to be remapped.
-     *    @param string $handler     New target handler.
-     *    @access public
-     */
-    function mapHandler($mode, $handler) {
-        $this->_mode_handlers[$mode] = $handler;
-    }
-
-    /**
-     *    Splits the page text into tokens. Will fail
-     *    if the handlers report an error or if no
-     *    content is consumed. If successful then each
-     *    unparsed and parsed token invokes a call to the
-     *    held listener.
-     *    @param string $raw        Raw HTML text.
-     *    @return boolean           True on success, else false.
-     *    @access public
-     */
-    function parse($raw) {
-        if (! isset($this->_parser)) {
-            return false;
-        }
-        $length = strlen($raw);
-        while (is_array($parsed = $this->_reduce($raw))) {
-            list($raw, $unmatched, $matched, $mode) = $parsed;
-            if (! $this->_dispatchTokens($unmatched, $matched, $mode)) {
-                return false;
-            }
-            if ($raw === '') {
-                return true;
-            }
-            if (strlen($raw) == $length) {
-                return false;
-            }
-            $length = strlen($raw);
-        }
-        if (! $parsed) {
-            return false;
-        }
-        return $this->_invokeParser($raw, LEXER_UNMATCHED);
-    }
-
-    /**
-     *    Sends the matched token and any leading unmatched
-     *    text to the parser changing the lexer to a new
-     *    mode if one is listed.
-     *    @param string $unmatched    Unmatched leading portion.
-     *    @param string $matched      Actual token match.
-     *    @param string $mode         Mode after match. A boolean
-     *                                false mode causes no change.
-     *    @return boolean             False if there was any error
-     *                                from the parser.
-     *    @access private
-     */
-    function _dispatchTokens($unmatched, $matched, $mode = false) {
-        if (! $this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
-            return false;
-        }
-        if (is_bool($mode)) {
-            return $this->_invokeParser($matched, LEXER_MATCHED);
-        }
-        if ($this->_isModeEnd($mode)) {
-            if (! $this->_invokeParser($matched, LEXER_EXIT)) {
-                return false;
-            }
-            return $this->_mode->leave();
-        }
-        if ($this->_isSpecialMode($mode)) {
-            $this->_mode->enter($this->_decodeSpecial($mode));
-            if (! $this->_invokeParser($matched, LEXER_SPECIAL)) {
-                return false;
-            }
-            return $this->_mode->leave();
-        }
-        $this->_mode->enter($mode);
-        return $this->_invokeParser($matched, LEXER_ENTER);
-    }
-
-    /**
-     *    Tests to see if the new mode is actually to leave
-     *    the current mode and pop an item from the matching
-     *    mode stack.
-     *    @param string $mode    Mode to test.
-     *    @return boolean        True if this is the exit mode.
-     *    @access private
-     */
-    function _isModeEnd($mode) {
-        return ($mode === "__exit");
-    }
-
-    /**
-     *    Test to see if the mode is one where this mode
-     *    is entered for this token only and automatically
-     *    leaves immediately afterwoods.
-     *    @param string $mode    Mode to test.
-     *    @return boolean        True if this is the exit mode.
-     *    @access private
-     */
-    function _isSpecialMode($mode) {
-        return (strncmp($mode, "_", 1) == 0);
-    }
-
-    /**
-     *    Strips the magic underscore marking single token
-     *    modes.
-     *    @param string $mode    Mode to decode.
-     *    @return string         Underlying mode name.
-     *    @access private
-     */
-    function _decodeSpecial($mode) {
-        return substr($mode, 1);
-    }
-
-    /**
-     *    Calls the parser method named after the current
-     *    mode. Empty content will be ignored. The lexer
-     *    has a parser handler for each mode in the lexer.
-     *    @param string $content        Text parsed.
-     *    @param boolean $is_match      Token is recognised rather
-     *                                  than unparsed data.
-     *    @access private
-     */
-    function _invokeParser($content, $is_match) {
-        if (($content === '') || ($content === false)) {
-            return true;
-        }
-        $handler = $this->_mode_handlers[$this->_mode->getCurrent()];
-        return $this->_parser->$handler($content, $is_match);
-    }
-
-    /**
-     *    Tries to match a chunk of text and if successful
-     *    removes the recognised chunk and any leading
-     *    unparsed data. Empty strings will not be matched.
-     *    @param string $raw         The subject to parse. This is the
-     *                               content that will be eaten.
-     *    @return array/boolean      Three item list of unparsed
-     *                               content followed by the
-     *                               recognised token and finally the
-     *                               action the parser is to take.
-     *                               True if no match, false if there
-     *                               is a parsing error.
-     *    @access private
-     */
-    function _reduce($raw) {
-        $match = array();
-        if ($action = $this->_regexes[$this->_mode->getCurrent()]->match($raw, $match)) {
-            $unparsed_character_count = strpos($raw, $match);
-            $unparsed = substr($raw, 0, $unparsed_character_count);
-            $raw = substr($raw, $unparsed_character_count + strlen($match));
-            return array($raw, $unparsed, $match, $action);
-        }
-        return true;
-    }
-}
-
-/**
- *    Breaks HTML into SAX events.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHtmlLexer extends SimpleLexer {
-
-    /**
-     *    Sets up the lexer with case insensitive matching
-     *    and adds the HTML handlers.
-     *    @param SimpleSaxParser $parser  Handling strategy by
-     *                                    reference.
-     *    @access public
-     */
-    function SimpleHtmlLexer(&$parser) {
-        $this->SimpleLexer($parser, 'text');
-        $this->mapHandler('text', 'acceptTextToken');
-        $this->_addSkipping();
-        foreach ($this->_getParsedTags() as $tag) {
-            $this->_addTag($tag);
-        }
-        $this->_addInTagTokens();
-    }
-
-    /**
-     *    List of parsed tags. Others are ignored.
-     *    @return array        List of searched for tags.
-     *    @access private
-     */
-    function _getParsedTags() {
-        return array('a', 'base', 'title', 'form', 'input', 'button', 'textarea', 'select',
-                'option', 'frameset', 'frame', 'label');
-    }
-
-    /**
-     *    The lexer has to skip certain sections such
-     *    as server code, client code and styles.
-     *    @access private
-     */
-    function _addSkipping() {
-        $this->mapHandler('css', 'ignore');
-        $this->addEntryPattern('<style', 'text', 'css');
-        $this->addExitPattern('</style>', 'css');
-        $this->mapHandler('js', 'ignore');
-        $this->addEntryPattern('<script', 'text', 'js');
-        $this->addExitPattern('</script>', 'js');
-        $this->mapHandler('comment', 'ignore');
-        $this->addEntryPattern('<!--', 'text', 'comment');
-        $this->addExitPattern('-->', 'comment');
-    }
-
-    /**
-     *    Pattern matches to start and end a tag.
-     *    @param string $tag          Name of tag to scan for.
-     *    @access private
-     */
-    function _addTag($tag) {
-        $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
-        $this->addEntryPattern("<$tag", 'text', 'tag');
-    }
-
-    /**
-     *    Pattern matches to parse the inside of a tag
-     *    including the attributes and their quoting.
-     *    @access private
-     */
-    function _addInTagTokens() {
-        $this->mapHandler('tag', 'acceptStartToken');
-        $this->addSpecialPattern('\s+', 'tag', 'ignore');
-        $this->_addAttributeTokens();
-        $this->addExitPattern('/>', 'tag');
-        $this->addExitPattern('>', 'tag');
-    }
-
-    /**
-     *    Matches attributes that are either single quoted,
-     *    double quoted or unquoted.
-     *    @access private
-     */
-    function _addAttributeTokens() {
-        $this->mapHandler('dq_attribute', 'acceptAttributeToken');
-        $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
-        $this->addPattern("\\\\\"", 'dq_attribute');
-        $this->addExitPattern('"', 'dq_attribute');
-        $this->mapHandler('sq_attribute', 'acceptAttributeToken');
-        $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
-        $this->addPattern("\\\\'", 'sq_attribute');
-        $this->addExitPattern("'", 'sq_attribute');
-        $this->mapHandler('uq_attribute', 'acceptAttributeToken');
-        $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
-    }
-}
-
-/**
- *    Converts HTML tokens into selected SAX events.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHtmlSaxParser {
-    var $_lexer;
-    var $_listener;
-    var $_tag;
-    var $_attributes;
-    var $_current_attribute;
-
-    /**
-     *    Sets the listener.
-     *    @param SimpleSaxListener $listener    SAX event handler.
-     *    @access public
-     */
-    function SimpleHtmlSaxParser(&$listener) {
-        $this->_listener = &$listener;
-        $this->_lexer = &$this->createLexer($this);
-        $this->_tag = '';
-        $this->_attributes = array();
-        $this->_current_attribute = '';
-    }
-
-    /**
-     *    Runs the content through the lexer which
-     *    should call back to the acceptors.
-     *    @param string $raw      Page text to parse.
-     *    @return boolean         False if parse error.
-     *    @access public
-     */
-    function parse($raw) {
-        return $this->_lexer->parse($raw);
-    }
-
-    /**
-     *    Sets up the matching lexer. Starts in 'text' mode.
-     *    @param SimpleSaxParser $parser    Event generator, usually $self.
-     *    @return SimpleLexer               Lexer suitable for this parser.
-     *    @access public
-     *    @static
-     */
-    function &createLexer(&$parser) {
-        $lexer = &new SimpleHtmlLexer($parser);
-        return $lexer;
-    }
-
-    /**
-     *    Accepts a token from the tag mode. If the
-     *    starting element completes then the element
-     *    is dispatched and the current attributes
-     *    set back to empty. The element or attribute
-     *    name is converted to lower case.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptStartToken($token, $event) {
-        if ($event == LEXER_ENTER) {
-            $this->_tag = strtolower(substr($token, 1));
-            return true;
-        }
-        if ($event == LEXER_EXIT) {
-            $success = $this->_listener->startElement(
-                    $this->_tag,
-                    $this->_attributes);
-            $this->_tag = '';
-            $this->_attributes = array();
-            return $success;
-        }
-        if ($token != '=') {
-            $this->_current_attribute = strtolower(SimpleHtmlSaxParser::decodeHtml($token));
-            $this->_attributes[$this->_current_attribute] = '';
-        }
-        return true;
-    }
-
-    /**
-     *    Accepts a token from the end tag mode.
-     *    The element name is converted to lower case.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptEndToken($token, $event) {
-        if (! preg_match('/<\/(.*)>/', $token, $matches)) {
-            return false;
-        }
-        return $this->_listener->endElement(strtolower($matches[1]));
-    }
-
-    /**
-     *    Part of the tag data.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptAttributeToken($token, $event) {
-        if ($this->_current_attribute) {
-            if ($event == LEXER_UNMATCHED) {
-                $this->_attributes[$this->_current_attribute] .=
-                        SimpleHtmlSaxParser::decodeHtml($token);
-            }
-            if ($event == LEXER_SPECIAL) {
-                $this->_attributes[$this->_current_attribute] .=
-                        preg_replace('/^=\s*/' , '', SimpleHtmlSaxParser::decodeHtml($token));
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    A character entity.
-     *    @param string $token    Incoming characters.
-     *    @param integer $event   Lexer event type.
-     *    @return boolean         False if parse error.
-     *    @access public
-     */
-    function acceptEntityToken($token, $event) {
-    }
-
-    /**
-     *    Character data between tags regarded as
-     *    important.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptTextToken($token, $event) {
-        return $this->_listener->addContent($token);
-    }
-
-    /**
-     *    Incoming data to be ignored.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function ignore($token, $event) {
-        return true;
-    }
-
-    /**
-     *    Decodes any HTML entities.
-     *    @param string $html    Incoming HTML.
-     *    @return string         Outgoing plain text.
-     *    @access public
-     *    @static
-     */
-    function decodeHtml($html) {
-        return html_entity_decode($html, ENT_QUOTES);
-    }
-
-    /**
-     *    Turns HTML into text browser visible text. Images
-     *    are converted to their alt text and tags are supressed.
-     *    Entities are converted to their visible representation.
-     *    @param string $html        HTML to convert.
-     *    @return string             Plain text.
-     *    @access public
-     *    @static
-     */
-    function normalise($html) {
-        $text = preg_replace('|<!--.*?-->|', '', $html);
-        $text = preg_replace('|<script[^>]*>.*?</script>|', '', $text);
-        $text = preg_replace('|<img[^>]*alt\s*=\s*"([^"]*)"[^>]*>|', ' \1 ', $text);
-        $text = preg_replace('|<img[^>]*alt\s*=\s*\'([^\']*)\'[^>]*>|', ' \1 ', $text);
-        $text = preg_replace('|<img[^>]*alt\s*=\s*([a-zA-Z_]+)[^>]*>|', ' \1 ', $text);
-        $text = preg_replace('|<[^>]*>|', '', $text);
-        $text = SimpleHtmlSaxParser::decodeHtml($text);
-        $text = preg_replace('|\s+|', ' ', $text);
-        return trim(trim($text), "\xA0");        // TODO: The \xAO is a &nbsp;. Add a test for this.
-    }
-}
-
-/**
- *    SAX event handler.
- *    @package SimpleTest
- *    @subpackage WebTester
- *    @abstract
- */
-class SimpleSaxListener {
-
-    /**
-     *    Sets the document to write to.
-     *    @access public
-     */
-    function SimpleSaxListener() {
-    }
-
-    /**
-     *    Start of element event.
-     *    @param string $name        Element name.
-     *    @param hash $attributes    Name value pairs.
-     *                               Attributes without content
-     *                               are marked as true.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function startElement($name, $attributes) {
-    }
-
-    /**
-     *    End of element event.
-     *    @param string $name        Element name.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function endElement($name) {
-    }
-
-    /**
-     *    Unparsed, but relevant data.
-     *    @param string $text        May include unparsed tags.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function addContent($text) {
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/reflection_php4.php b/tests/simpletest/reflection_php4.php
deleted file mode 100755
index c20dcaa820..0000000000
--- a/tests/simpletest/reflection_php4.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reflection_php4.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**
- *  Version specific reflection API.
- *  @package SimpleTest
- *  @subpackage UnitTester
- *  @ignore duplicate with reflection_php5.php
- */
-class SimpleReflection {
-    var $_interface;
-
-    /**
-     *    Stashes the class/interface.
-     *    @param string $interface    Class or interface
-     *                                to inspect.
-     */
-    function SimpleReflection($interface) {
-        $this->_interface = $interface;
-    }
-
-    /**
-     *    Checks that a class has been declared.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExists() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExistsSansAutoload() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Checks that a class or interface has been
-     *    declared.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExists() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExistsSansAutoload() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Gets the list of methods on a class or
-     *    interface.
-     *    @returns array          List of method names.
-     *    @access public
-     */
-    function getMethods() {
-        return get_class_methods($this->_interface);
-    }
-
-    /**
-     *    Gets the list of interfaces from a class. If the
-     *    class name is actually an interface then just that
-     *    interface is returned.
-     *    @returns array          List of interfaces.
-     *    @access public
-     */
-    function getInterfaces() {
-        return array();
-    }
-
-    /**
-     *    Finds the parent class name.
-     *    @returns string      Parent class name.
-     *    @access public
-     */
-    function getParent() {
-        return strtolower(get_parent_class($this->_interface));
-    }
-
-    /**
-     *    Determines if the class is abstract, which for PHP 4
-     *    will never be the case.
-     *    @returns boolean      True if abstract.
-     *    @access public
-     */
-    function isAbstract() {
-        return false;
-    }
-
-    /**
-     *    Determines if the the entity is an interface, which for PHP 4
-     *    will never be the case.
-     *    @returns boolean      True if interface.
-     *    @access public
-     */
-    function isInterface() {
-        return false;
-    }
-
-    /**
-     *    Scans for final methods, but as it's PHP 4 there
-     *    aren't any.
-     *    @returns boolean   True if the class has a final method.
-     *    @access public
-     */
-    function hasFinal() {
-        return false;
-    }
-
-    /**
-     *    Gets the source code matching the declaration
-     *    of a method.
-     *    @param string $method       Method name.
-     *    @access public
-     */
-    function getSignature($method) {
-        return "function &$method()";
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/reflection_php5.php b/tests/simpletest/reflection_php5.php
deleted file mode 100755
index 8383bccd3f..0000000000
--- a/tests/simpletest/reflection_php5.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reflection_php5.php 1683 2008-03-05 21:57:08Z lastcraft $
- */
-
-/**
- *    Version specific reflection API.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReflection {
-    var $_interface;
-
-    /**
-     *    Stashes the class/interface.
-     *    @param string $interface    Class or interface
-     *                                to inspect.
-     */
-    function SimpleReflection($interface) {
-        $this->_interface = $interface;
-    }
-
-    /**
-     *    Checks that a class has been declared. Versions
-     *    before PHP5.0.2 need a check that it's not really
-     *    an interface.
-     *    @return boolean            True if defined.
-     *    @access public
-     */
-    function classExists() {
-        if (! class_exists($this->_interface)) {
-            return false;
-        }
-        $reflection = new ReflectionClass($this->_interface);
-        return ! $reflection->isInterface();
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExistsSansAutoload() {
-        return class_exists($this->_interface, false);
-    }
-
-    /**
-     *    Checks that a class or interface has been
-     *    declared.
-     *    @return boolean            True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExists() {
-        return $this->_classOrInterfaceExistsWithAutoload($this->_interface, true);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExistsSansAutoload() {
-        return $this->_classOrInterfaceExistsWithAutoload($this->_interface, false);
-    }
-
-    /**
-     *    Needed to select the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @param string $interface       Class or interface name.
-     *    @param boolean $autoload       True totriggerautoload.
-     *    @return boolean                True if interface defined.
-     *    @access private
-     */
-    function _classOrInterfaceExistsWithAutoload($interface, $autoload) {
-        if (function_exists('interface_exists')) {
-            if (interface_exists($this->_interface, $autoload)) {
-                return true;
-            }
-        }
-        return class_exists($this->_interface, $autoload);
-    }
-
-    /**
-     *    Gets the list of methods on a class or
-     *    interface.
-     *    @returns array              List of method names.
-     *    @access public
-     */
-    function getMethods() {
-        return array_unique(get_class_methods($this->_interface));
-    }
-
-    /**
-     *    Gets the list of interfaces from a class. If the
-     *    class name is actually an interface then just that
-     *    interface is returned.
-     *    @returns array          List of interfaces.
-     *    @access public
-     */
-    function getInterfaces() {
-        $reflection = new ReflectionClass($this->_interface);
-        if ($reflection->isInterface()) {
-            return array($this->_interface);
-        }
-        return $this->_onlyParents($reflection->getInterfaces());
-    }
-
-    /**
-     *    Gets the list of methods for the implemented
-     *    interfaces only.
-     *    @returns array      List of enforced method signatures.
-     *    @access public
-     */
-    function getInterfaceMethods() {
-        $methods = array();
-        foreach ($this->getInterfaces() as $interface) {
-            $methods = array_merge($methods, get_class_methods($interface));
-        }
-        return array_unique($methods);
-    }
-
-    /**
-     *    Checks to see if the method signature has to be tightly
-     *    specified.
-     *    @param string $method        Method name.
-     *    @returns boolean             True if enforced.
-     *    @access private
-     */
-    function _isInterfaceMethod($method) {
-        return in_array($method, $this->getInterfaceMethods());
-    }
-
-    /**
-     *    Finds the parent class name.
-     *    @returns string      Parent class name.
-     *    @access public
-     */
-    function getParent() {
-        $reflection = new ReflectionClass($this->_interface);
-        $parent = $reflection->getParentClass();
-        if ($parent) {
-            return $parent->getName();
-        }
-        return false;
-    }
-
-    /**
-     *    Trivially determines if the class is abstract.
-     *    @returns boolean      True if abstract.
-     *    @access public
-     */
-    function isAbstract() {
-        $reflection = new ReflectionClass($this->_interface);
-        return $reflection->isAbstract();
-    }
-
-    /**
-     *    Trivially determines if the class is an interface.
-     *    @returns boolean      True if interface.
-     *    @access public
-     */
-    function isInterface() {
-        $reflection = new ReflectionClass($this->_interface);
-        return $reflection->isInterface();
-    }
-
-    /**
-     *    Scans for final methods, as they screw up inherited
-     *    mocks by not allowing you to override them.
-     *    @returns boolean   True if the class has a final method.
-     *    @access public
-     */
-    function hasFinal() {
-        $reflection = new ReflectionClass($this->_interface);
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->isFinal()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Whittles a list of interfaces down to only the
-     *    necessary top level parents.
-     *    @param array $interfaces     Reflection API interfaces
-     *                                 to reduce.
-     *    @returns array               List of parent interface names.
-     *    @access private
-     */
-    function _onlyParents($interfaces) {
-        $parents = array();
-        $blacklist = array();
-        foreach ($interfaces as $interface) {
-            foreach($interfaces as $possible_parent) {
-                if ($interface->getName() == $possible_parent->getName()) {
-                    continue;
-                }
-                if ($interface->isSubClassOf($possible_parent)) {
-                    $blacklist[$possible_parent->getName()] = true;
-                }
-            }
-            if (!isset($blacklist[$interface->getName()])) {
-                $parents[] = $interface->getName();
-            }
-        }
-        return $parents;
-    }
-
-    /**
-     * Checks whether a method is abstract or not.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is abstract, else false
-     * @access  private
-     */
-    function _isAbstractMethod($name) {
-        $interface = new ReflectionClass($this->_interface);
-        if (! $interface->hasMethod($name)) {
-            return false;
-        }
-        return $interface->getMethod($name)->isAbstract();
-    }
-
-    /**
-     * Checks whether a method is the constructor.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is the constructor
-     * @access  private
-     */
-    function _isConstructor($name) {
-        return ($name == '__construct') || ($name == $this->_interface);
-    }
-
-    /**
-     * Checks whether a method is abstract in all parents or not.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is abstract in parent, else false
-     * @access  private
-     */
-    function _isAbstractMethodInParents($name) {
-        $interface = new ReflectionClass($this->_interface);
-        $parent = $interface->getParentClass();
-        while($parent) {
-            if (! $parent->hasMethod($name)) {
-                return false;
-            }
-            if ($parent->getMethod($name)->isAbstract()) {
-                return true;
-            }
-            $parent = $parent->getParentClass();
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether a method is static or not.
-     * @param   string  $name   Method name
-     * @return  bool            true if method is static, else false
-     * @access  private
-     */
-    function _isStaticMethod($name) {
-        $interface = new ReflectionClass($this->_interface);
-        if (! $interface->hasMethod($name)) {
-            return false;
-        }
-        return $interface->getMethod($name)->isStatic();
-    }
-
-    /**
-     *    Writes the source code matching the declaration
-     *    of a method.
-     *    @param string $name    Method name.
-     *    @return string         Method signature up to last
-     *                           bracket.
-     *    @access public
-     */
-    function getSignature($name) {
-        if ($name == '__set') {
-            return 'function __set($key, $value)';
-        }
-        if ($name == '__call') {
-            return 'function __call($method, $arguments)';
-        }
-        if (version_compare(phpversion(), '5.1.0', '>=')) {
-            if (in_array($name, array('__get', '__isset', $name == '__unset'))) {
-                return "function {$name}(\$key)";
-            }
-        }
-        if ($name == '__toString') {
-            return "function $name()";
-        }
-        if ($this->_isInterfaceMethod($name) ||
-                $this->_isAbstractMethod($name) ||
-                $this->_isAbstractMethodInParents($name) ||
-                $this->_isStaticMethod($name)) {
-            return $this->_getFullSignature($name);
-        }
-        return "function $name()";
-    }
-
-    /**
-     *    For a signature specified in an interface, full
-     *    details must be replicated to be a valid implementation.
-     *    @param string $name    Method name.
-     *    @return string         Method signature up to last
-     *                           bracket.
-     *    @access private
-     */
-    function _getFullSignature($name) {
-        $interface = new ReflectionClass($this->_interface);
-        $method = $interface->getMethod($name);
-        $reference = $method->returnsReference() ? '&' : '';
-        $static = $method->isStatic() ? 'static ' : '';
-        return "{$static}function $reference$name(" .
-                implode(', ', $this->_getParameterSignatures($method)) .
-                ")";
-    }
-
-    /**
-     *    Gets the source code for each parameter.
-     *    @param ReflectionMethod $method   Method object from
-     *                                      reflection API
-     *    @return array                     List of strings, each
-     *                                      a snippet of code.
-     *    @access private
-     */
-    function _getParameterSignatures($method) {
-        $signatures = array();
-        foreach ($method->getParameters() as $parameter) {
-            $signature = '';
-            $type = $parameter->getClass();
-            if (is_null($type) && version_compare(phpversion(), '5.1.0', '>=') && $parameter->isArray()) {
-                $signature .= 'array ';
-            } elseif (!is_null($type)) {
-                $signature .= $type->getName() . ' ';
-            }
-            if ($parameter->isPassedByReference()) {
-                $signature .= '&';
-            }
-            $signature .= '$' . $this->_suppressSpurious($parameter->getName());
-            if ($this->_isOptional($parameter)) {
-                $signature .= ' = null';
-            }
-            $signatures[] = $signature;
-        }
-        return $signatures;
-    }
-
-    /**
-     *    The SPL library has problems with the
-     *    Reflection library. In particular, you can
-     *    get extra characters in parameter names :(.
-     *    @param string $name    Parameter name.
-     *    @return string         Cleaner name.
-     *    @access private
-     */
-    function _suppressSpurious($name) {
-        return str_replace(array('[', ']', ' '), '', $name);
-    }
-
-    /**
-     *    Test of a reflection parameter being optional
-     *    that works with early versions of PHP5.
-     *    @param reflectionParameter $parameter    Is this optional.
-     *    @return boolean                          True if optional.
-     *    @access private
-     */
-    function _isOptional($parameter) {
-        if (method_exists($parameter, 'isOptional')) {
-            return $parameter->isOptional();
-        }
-        return false;
-    }
-}
-?>
diff --git a/tests/simpletest/remote.php b/tests/simpletest/remote.php
deleted file mode 100755
index 412434b9ae..0000000000
--- a/tests/simpletest/remote.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: remote.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/browser.php');
-require_once(dirname(__FILE__) . '/xml.php');
-require_once(dirname(__FILE__) . '/test_case.php');
-/**#@-*/
-
-/**
- *    Runs an XML formated test on a remote server.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class RemoteTestCase {
-    var $_url;
-    var $_dry_url;
-    var $_size;
-
-    /**
-     *    Sets the location of the remote test.
-     *    @param string $url       Test location.
-     *    @param string $dry_url   Location for dry run.
-     *    @access public
-     */
-    function RemoteTestCase($url, $dry_url = false) {
-        $this->_url = $url;
-        $this->_dry_url = $dry_url ? $dry_url : $url;
-        $this->_size = false;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_url;
-    }
-
-    /**
-     *    Runs the top level test for this class. Currently
-     *    reads the data as a single chunk. I'll fix this
-     *    once I have added iteration to the browser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @returns boolean                   True if no failures.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $browser = &$this->_createBrowser();
-        $xml = $browser->get($this->_url);
-        if (! $xml) {
-            trigger_error('Cannot read remote test URL [' . $this->_url . ']');
-            return false;
-        }
-        $parser = &$this->_createParser($reporter);
-        if (! $parser->parse($xml)) {
-            trigger_error('Cannot parse incoming XML from [' . $this->_url . ']');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Creates a new web browser object for fetching
-     *    the XML report.
-     *    @return SimpleBrowser           New browser.
-     *    @access protected
-     */
-    function &_createBrowser() {
-        $browser = &new SimpleBrowser();
-        return $browser;
-    }
-
-    /**
-     *    Creates the XML parser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @return SimpleTestXmlListener      XML reader.
-     *    @access protected
-     */
-    function &_createParser(&$reporter) {
-        $parser = &new SimpleTestXmlParser($reporter);
-        return $parser;
-    }
-
-    /**
-     *    Accessor for the number of subtests.
-     *    @return integer           Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        if ($this->_size === false) {
-            $browser = &$this->_createBrowser();
-            $xml = $browser->get($this->_dry_url);
-            if (! $xml) {
-                trigger_error('Cannot read remote test URL [' . $this->_dry_url . ']');
-                return false;
-            }
-            $reporter = &new SimpleReporter();
-            $parser = &$this->_createParser($reporter);
-            if (! $parser->parse($xml)) {
-                trigger_error('Cannot parse incoming XML from [' . $this->_dry_url . ']');
-                return false;
-            }
-            $this->_size = $reporter->getTestCaseCount();
-        }
-        return $this->_size;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/reporter.php b/tests/simpletest/reporter.php
deleted file mode 100755
index 41513f7c1c..0000000000
--- a/tests/simpletest/reporter.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reporter.php 1702 2008-03-25 00:08:04Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-/**#@-*/
-
-/**
- *    Sample minimal test displayer. Generates only
- *    failure messages and a pass count.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class HtmlReporter extends SimpleReporter {
-    var $_character_set;
-
-    /**
-     *    Does nothing yet. The first output will
-     *    be sent on the first test start. For use
-     *    by a web browser.
-     *    @access public
-     */
-    function HtmlReporter($character_set = 'ISO-8859-1') {
-        $this->SimpleReporter();
-        $this->_character_set = $character_set;
-    }
-
-    /**
-     *    Paints the top of the web page setting the
-     *    title to the name of the starting test.
-     *    @param string $test_name      Name class of test.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-        $this->sendNoCacheHeaders();
-        print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
-        echo '<html style="height:100%;">';
-        echo '<head>';
-        echo '<title>Test Suite</title>';
-        echo '</head>';
-       	echo '<body style="padding:0px;margin:0px;height:100%;">';
-       	echo '<div id="wrapper" style="width:90%;padding-left:5%;padding-bottom:10%;">';//wrapper
-       	echo '<div id="header1">';//header1
-        echo '<div id="header3" style="min-height:100px;background:url(img/header-logo.png) no-repeat left;"><br/>';//header3
-        echo '<div id="header4" style="float:right;font-size:25px;color:#01933E;"><br/>';//header4
-        echo ''. date('Y - m - d').'';
-        echo '</div>';//fin header 4
-        echo '</div><br/>';//fin header 3
-        echo '</div>';//fin header 1
-        echo '<div id="header2" style="width:100%;border:2px solid #DDDDDD;">';//header2     
-        echo '<div id="content2" style="background-image:url(img/bg-header4.png);background-repeat:repeat-x";>
-			<h2><div style="font-size:18px;font-family:Tahoma,Geneva,sans-serif;color:#01933E;text-decoration:none;">These results showing how many functions have been tested in the code of chamilo 1.8.6.2</div></h2><br/>         		    
-				<div style="font-size:12px;font-family:Tahoma,Geneva,sans-serif;color:#01933E;">
-				<p>This page showing the different types results than have been tested and showing the lines the problems.</p>  
-				<ol><li>This results show the amount of the tests than have been tested.</li>
-				<li>This results show the amount of the tests than have passed.</li>
-				<li>This results show the amount of the tests than have failed.</li>
-				<li>This results show the amount of exceptions in the tests.</li></ol>
-				<p>You can always find more information about simpletest on the website: http://www.lastcraft.com </p>
-				<p>"Only a well software like Chamilo, is perfect when has been tested by excellent Testing Engineers".</p>
-				</div></div>';//content2    			
-		echo '</div><br/>';//fin header2
-		//flush();
-    }
-    
-    /**
-     *    Send the headers necessary to ensure the page is
-     *    reloaded on every request. Otherwise you could be
-     *    scratching your head over out of date test data.
-     *    @access public
-     *    @static
-     */
-    function sendNoCacheHeaders() {
-        if (! headers_sent()) {
-            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            header("Cache-Control: no-store, no-cache, must-revalidate");
-            header("Cache-Control: post-check=0, pre-check=0", false);
-            header("Pragma: no-cache");
-        }
-    }
-
-    /**
-     *    Paints the CSS. Add additional styles here.
-     *    @return string            CSS code as text.
-     *    @access protected
-     */
-    function _getCss() {
-        return ".fail { background-color: inherit; color: red; }" .
-                ".pass { background-color: inherit; color: green; }" .
-                " pre { background-color: lightgray; color: inherit; }";
-                
-    }
-
-    /**
-     *    Paints the end of the test with a summary of
-     *    the passes and failures.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-        $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
-        echo '<div id="header5" style="background-color: '.$colour.';color: white;font-weight:bold;">';//header 5
-        print "<style type=\"text/css\">\n";
-        print $this->_getCss() . "\n";
-        print "</style>\n";
-        echo ' Test cases complete: ';
-        echo $this->getTestCaseProgress() . '/' . $this->getTestCaseCount().'<br/><br/>';
-        echo  'Passes: ' . $this->getPassCount() . '  ';
-        echo  'Fails: ' . $this->getFailCount() . '  ';
-        echo  'Exceptions: ' . $this->getExceptionCount() . ' ';
- 		echo '</div>';//fin header5
- 		echo '</div>';//fin wrapper
- 		echo '<div id="footer1" style= "height:6em;background-image:url(img/bg-footer.gif);background-repeat:repeat-x ">';
-        echo '</div>';//fin footer 1
-        echo '</body>';
-        echo '</html>';		        
-    }
-	
-	
-
-    /**
-     *    Paints the test failure with a breadcrumbs
-     *    trail of the nesting test suites below the
-     *    top level test.
-     *    @param string $message    Failure message displayed in
-     *                              the context of the other tests.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print "<span class=\"fail\">Fail</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . $this->_htmlEntities($message) . "<br />\n";
-    }
-
-    /**
-     *    Paints a PHP error.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print "<span class=\"fail\">Exception</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
-    }
-
-    /**
-     *    Paints a PHP exception.
-     *    @param Exception $exception        Exception to display.
-     *    @access public
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        print "<span class=\"fail\">Exception</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print " -&gt; <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print "<span class=\"pass\">Skipped</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . $this->_htmlEntities($message) . "<br />\n";
-    }
-
-    /**
-     *    Paints formatted text such as dumped variables.
-     *    @param string $message        Text to show.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        print '<pre>' . $this->_htmlEntities($message) . '</pre>';
-    }
-
-    /**
-     *    Character set adjusted entity conversion.
-     *    @param string $message    Plain text or Unicode message.
-     *    @return string            Browser readable message.
-     *    @access protected
-     */
-    function _htmlEntities($message) {
-        return htmlentities($message, ENT_COMPAT, $this->_character_set);
-    }
-}
-
-/**
- *    Sample minimal test displayer. Generates only
- *    failure messages and a pass count. For command
- *    line use. I've tried to make it look like JUnit,
- *    but I wanted to output the errors as they arrived
- *    which meant dropping the dots.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class TextReporter extends SimpleReporter {
-
-    /**
-     *    Does nothing yet. The first output will
-     *    be sent on the first test start.
-     *    @access public
-     */
-    function TextReporter() {
-        $this->SimpleReporter();
-    }
-
-    /**
-     *    Paints the title only.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-        if (! SimpleReporter::inCli()) {
-            header('Content-type: text/plain');
-        }
-        print "$test_name\n";
-        flush();
-    }
-
-    /**
-     *    Paints the end of the test with a summary of
-     *    the passes and failures.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-        if ($this->getFailCount() + $this->getExceptionCount() == 0) {
-            print "OK\n";
-        } else {
-            print "FAILURES!!!\n";
-        }
-        print "Test cases run: " . $this->getTestCaseProgress() .
-                "/" . $this->getTestCaseCount() .
-                ", Passes: " . $this->getPassCount() .
-                ", Failures: " . $this->getFailCount() .
-                ", Exceptions: " . $this->getExceptionCount() . "\n";
-    }
-
-    /**
-     *    Paints the test failure as a stack trace.
-     *    @param string $message    Failure message displayed in
-     *                              the context of the other tests.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print $this->getFailCount() . ") $message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Paints a PHP error or exception.
-     *    @param string $message        Message to be shown.
-     *    @access public
-     *    @abstract
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Paints a PHP error or exception.
-     *    @param Exception $exception      Exception to describe.
-     *    @access public
-     *    @abstract
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print "Skip: $message\n";
-    }
-
-    /**
-     *    Paints formatted text such as dumped variables.
-     *    @param string $message        Text to show.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        print "$message\n";
-        flush();
-    }
-}
-
-/**
- *    Runs just a single test group, a single case or
- *    even a single test within that case.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SelectiveReporter extends SimpleReporterDecorator {
-    var $_just_this_case = false;
-    var $_just_this_test = false;
-    var $_on;
-
-    /**
-     *    Selects the test case or group to be run,
-     *    and optionally a specific test.
-     *    @param SimpleScorer $reporter    Reporter to receive events.
-     *    @param string $just_this_case    Only this case or group will run.
-     *    @param string $just_this_test    Only this test method will run.
-     */
-    function SelectiveReporter(&$reporter, $just_this_case = false, $just_this_test = false) {
-        if (isset($just_this_case) && $just_this_case) {
-            $this->_just_this_case = strtolower($just_this_case);
-            $this->_off();
-        } else {
-            $this->_on();
-        }
-        if (isset($just_this_test) && $just_this_test) {
-            $this->_just_this_test = strtolower($just_this_test);
-        }
-        $this->SimpleReporterDecorator($reporter);
-    }
-
-    /**
-     *    Compares criteria to actual the case/group name.
-     *    @param string $test_case    The incoming test.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    function _matchesTestCase($test_case) {
-        return $this->_just_this_case == strtolower($test_case);
-    }
-
-    /**
-     *    Compares criteria to actual the test name. If no
-     *    name was specified at the beginning, then all tests
-     *    can run.
-     *    @param string $method       The incoming test method.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    function _shouldRunTest($test_case, $method) {
-        if ($this->_isOn() || $this->_matchesTestCase($test_case)) {
-            if ($this->_just_this_test) {
-                return $this->_just_this_test == strtolower($method);
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Switch on testing for the group or subgroup.
-     *    @access private
-     */
-    function _on() {
-        $this->_on = true;
-    }
-
-    /**
-     *    Switch off testing for the group or subgroup.
-     *    @access private
-     */
-    function _off() {
-        $this->_on = false;
-    }
-
-    /**
-     *    Is this group actually being tested?
-     *    @return boolean     True if the current test group is active.
-     *    @access private
-     */
-    function _isOn() {
-        return $this->_on;
-    }
-
-    /**
-     *    Veto everything that doesn't match the method wanted.
-     *    @param string $test_case       Name of test case.
-     *    @param string $method          Name of test method.
-     *    @return boolean                True if test should be run.
-     *    @access public
-     */
-    function shouldInvoke($test_case, $method) {
-        if ($this->_shouldRunTest($test_case, $method)) {
-            return $this->_reporter->shouldInvoke($test_case, $method);
-        }
-        return false;
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_case     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_case, $size) {
-        if ($this->_just_this_case && $this->_matchesTestCase($test_case)) {
-            $this->_on();
-        }
-        $this->_reporter->paintGroupStart($test_case, $size);
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_case     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_case) {
-        $this->_reporter->paintGroupEnd($test_case);
-        if ($this->_just_this_case && $this->_matchesTestCase($test_case)) {
-            $this->_off();
-        }
-    }
-}
-
-/**
- *    Suppresses skip messages.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoSkipsReporter extends SimpleReporterDecorator {
-
-    /**
-     *    Does nothing.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) { }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/scorer.php b/tests/simpletest/scorer.php
deleted file mode 100755
index 47e77501df..0000000000
--- a/tests/simpletest/scorer.php
+++ /dev/null
@@ -1,863 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: scorer.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+*/
-require_once(dirname(__FILE__) . '/invoker.php');
-/**#@-*/
-
-/**
- *    Can receive test events and display them. Display
- *    is achieved by making display methods available
- *    and visiting the incoming event.
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @abstract
- */
-class SimpleScorer {
-    var $_passes;
-    var $_fails;
-    var $_exceptions;
-    var $_is_dry_run;
-
-    /**
-     *    Starts the test run with no results.
-     *    @access public
-     */
-    function SimpleScorer() {
-        $this->_passes = 0;
-        $this->_fails = 0;
-        $this->_exceptions = 0;
-        $this->_is_dry_run = false;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        $this->_is_dry_run = $is_dry;
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        return ! $this->_is_dry_run;
-    }
-
-    /**
-     *    Can wrap the invoker in preperation for running
-     *    a test.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function &createInvoker(&$invoker) {
-        return $invoker;
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    Used for command line tools.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        if ($this->_exceptions + $this->_fails > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-    }
-
-    /**
-     *    Increments the pass count.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        $this->_passes++;
-    }
-
-    /**
-     *    Increments the fail count.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        $this->_fails++;
-    }
-
-    /**
-     *    Deals with PHP 4 throwing an error.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        $this->_exceptions++;
-    }
-
-    /**
-     *    Deals with PHP 5 throwing an exception.
-     *    @param Exception $exception    The actual exception thrown.
-     *    @access public
-     */
-    function paintException($exception) {
-        $this->_exceptions++;
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-    }
-
-    /**
-     *    Accessor for the number of passes so far.
-     *    @return integer       Number of passes.
-     *    @access public
-     */
-    function getPassCount() {
-        return $this->_passes;
-    }
-
-    /**
-     *    Accessor for the number of fails so far.
-     *    @return integer       Number of fails.
-     *    @access public
-     */
-    function getFailCount() {
-        return $this->_fails;
-    }
-
-    /**
-     *    Accessor for the number of untrapped errors
-     *    so far.
-     *    @return integer       Number of exceptions.
-     *    @access public
-     */
-    function getExceptionCount() {
-        return $this->_exceptions;
-    }
-
-    /**
-     *    Paints a simple supplementary message.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-    }
-
-    /**
-     *    Paints a formatted ASCII message such as a
-     *    variable dump.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-    }
-
-    /**
-     *    By default just ignores user generated events.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-    }
-}
-
-/**
- *    Recipient of generated test messages that can display
- *    page footers and headers. Also keeps track of the
- *    test nesting. This is the main base class on which
- *    to build the finished test (page based) displays.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReporter extends SimpleScorer {
-    var $_test_stack;
-    var $_size;
-    var $_progress;
-
-    /**
-     *    Starts the display with no results in.
-     *    @access public
-     */
-    function SimpleReporter() {
-        $this->SimpleScorer();
-        $this->_test_stack = array();
-        $this->_size = null;
-        $this->_progress = 0;
-    }
-
-    /**
-     *    Gets the formatter for variables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Paints the start of a group test. Will also paint
-     *    the page header and footer if this is the
-     *    first test. Will stash the size if the first
-     *    start.
-     *    @param string $test_name   Name of test that is starting.
-     *    @param integer $size       Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        if (! isset($this->_size)) {
-            $this->_size = $size;
-        }
-        if (count($this->_test_stack) == 0) {
-            $this->paintHeader($test_name);
-        }
-        $this->_test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a group test. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @param integer $progress   Number of test cases ending.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        array_pop($this->_test_stack);
-        if (count($this->_test_stack) == 0) {
-            $this->paintFooter($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test case. Will also paint
-     *    the page header and footer if this is the
-     *    first test. Will stash the size if the first
-     *    start.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        if (! isset($this->_size)) {
-            $this->_size = 1;
-        }
-        if (count($this->_test_stack) == 0) {
-            $this->paintHeader($test_name);
-        }
-        $this->_test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a test case. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        $this->_progress++;
-        array_pop($this->_test_stack);
-        if (count($this->_test_stack) == 0) {
-            $this->paintFooter($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        $this->_test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a test method. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        array_pop($this->_test_stack);
-    }
-
-    /**
-     *    Paints the test document header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     *    @abstract
-     */
-    function paintHeader($test_name) {
-    }
-
-    /**
-     *    Paints the test document footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     *    @abstract
-     */
-    function paintFooter($test_name) {
-    }
-
-    /**
-     *    Accessor for internal test stack. For
-     *    subclasses that need to see the whole test
-     *    history for display purposes.
-     *    @return array     List of methods in nesting order.
-     *    @access public
-     */
-    function getTestList() {
-        return $this->_test_stack;
-    }
-
-    /**
-     *    Accessor for total test size in number
-     *    of test cases. Null until the first
-     *    test is started.
-     *    @return integer   Total number of cases at start.
-     *    @access public
-     */
-    function getTestCaseCount() {
-        return $this->_size;
-    }
-
-    /**
-     *    Accessor for the number of test cases
-     *    completed so far.
-     *    @return integer   Number of ended cases.
-     *    @access public
-     */
-    function getTestCaseProgress() {
-        return $this->_progress;
-    }
-
-    /**
-     *    Static check for running in the comand line.
-     *    @return boolean        True if CLI.
-     *    @access public
-     *    @static
-     */
-    function inCli() {
-        return php_sapi_name() == 'cli';
-    }
-}
-
-/**
- *    For modifying the behaviour of the visual reporters.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReporterDecorator {
-    var $_reporter;
-
-    /**
-     *    Mediates between the reporter and the test case.
-     *    @param SimpleScorer $reporter       Reporter to receive events.
-     */
-    function SimpleReporterDecorator(&$reporter) {
-        $this->_reporter = &$reporter;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        $this->_reporter->makeDry($is_dry);
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    Used for command line tools.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        return $this->_reporter->getStatus();
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @return boolean                True if test should be run.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        return $this->_reporter->shouldInvoke($test_case_name, $method);
-    }
-
-    /**
-     *    Can wrap the invoker in preperation for running
-     *    a test.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function &createInvoker(&$invoker) {
-        return $this->_reporter->createInvoker($invoker);
-    }
-
-    /**
-     *    Gets the formatter for variables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return $this->_reporter->getDumper();
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        $this->_reporter->paintGroupStart($test_name, $size);
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        $this->_reporter->paintGroupEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        $this->_reporter->paintCaseStart($test_name);
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        $this->_reporter->paintCaseEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        $this->_reporter->paintMethodStart($test_name);
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        $this->_reporter->paintMethodEnd($test_name);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        $this->_reporter->paintPass($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        $this->_reporter->paintFail($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        $this->_reporter->paintError($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param Exception $exception        Exception to show.
-     *    @access public
-     */
-    function paintException($exception) {
-        $this->_reporter->paintException($exception);
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        $this->_reporter->paintSkip($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        $this->_reporter->paintMessage($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        $this->_reporter->paintFormattedMessage($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @return boolean            Should return false if this
-     *                               type of signal should fail the
-     *                               test suite.
-     *    @access public
-     */
-    function paintSignal($type, &$payload) {
-        $this->_reporter->paintSignal($type, $payload);
-    }
-}
-
-/**
- *    For sending messages to multiple reporters at
- *    the same time.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class MultipleReporter {
-    var $_reporters = array();
-
-    /**
-     *    Adds a reporter to the subscriber list.
-     *    @param SimpleScorer $reporter     Reporter to receive events.
-     *    @access public
-     */
-    function attachReporter(&$reporter) {
-        $this->_reporters[] = &$reporter;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->makeDry($is_dry);
-        }
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    If any reporter reports a failure, the whole
-     *    suite fails.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            if (! $this->_reporters[$i]->getStatus()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    It requires all reporters to want to run the method.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            if (! $this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Every reporter gets a chance to wrap the invoker.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function &createInvoker(&$invoker) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $invoker = &$this->_reporters[$i]->createInvoker($invoker);
-        }
-        return $invoker;
-    }
-
-    /**
-     *    Gets the formatter for variables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintGroupStart($test_name, $size);
-        }
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintGroupEnd($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintCaseStart($test_name);
-        }
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintCaseEnd($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintMethodStart($test_name);
-        }
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintMethodEnd($test_name);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintPass($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintFail($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintError($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param Exception $exception    Exception to display.
-     *    @access public
-     */
-    function paintException($exception) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintException($exception);
-        }
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintSkip($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintMessage($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintFormattedMessage($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @return boolean            Should return false if this
-     *                               type of signal should fail the
-     *                               test suite.
-     *    @access public
-     */
-    function paintSignal($type, &$payload) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintSignal($type, $payload);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/selector.php b/tests/simpletest/selector.php
deleted file mode 100755
index de044b85ad..0000000000
--- a/tests/simpletest/selector.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: selector.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by name attribute.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByName {
-    var $_name;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $name     Name attribute to match.
-     */
-    function SimpleByName($name) {
-        $this->_name = $name;
-    }
-
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     *    Compares with name attribute of widget.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        return ($widget->getName() == $this->_name);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by visible label or alt text.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByLabel {
-    var $_label;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $label     Visible text to match.
-     */
-    function SimpleByLabel($label) {
-        $this->_label = $label;
-    }
-
-    /**
-     *    Comparison. Compares visible text of widget or
-     *    related label.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        if (! method_exists($widget, 'isLabel')) {
-            return false;
-        }
-        return $widget->isLabel($this->_label);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches dy id attribute.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleById {
-    var $_id;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $id     ID atribute to match.
-     */
-    function SimpleById($id) {
-        $this->_id = $id;
-    }
-
-    /**
-     *    Comparison. Compares id attribute of widget.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        return $widget->isId($this->_id);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by visible label, name or alt text.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByLabelOrName {
-    var $_label;
-
-    /**
-     *    Stashes the name/label for later comparison.
-     *    @param string $label     Visible text to match.
-     */
-    function SimpleByLabelOrName($label) {
-        $this->_label = $label;
-    }
-
-    /**
-     *    Comparison. Compares visible text of widget or
-     *    related label or name.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        if (method_exists($widget, 'isLabel')) {
-            if ($widget->isLabel($this->_label)) {
-                return true;
-            }
-        }
-        return ($widget->getName() == $this->_label);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/shell_tester.php b/tests/simpletest/shell_tester.php
deleted file mode 100755
index b84af7b534..0000000000
--- a/tests/simpletest/shell_tester.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: shell_tester.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-/**#@-*/
-
-/**
- *    Wrapper for exec() functionality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleShell {
-    var $_output;
-
-    /**
-     *    Executes the shell comand and stashes the output.
-     *    @access public
-     */
-    function SimpleShell() {
-        $this->_output = false;
-    }
-
-    /**
-     *    Actually runs the command. Does not trap the
-     *    error stream output as this need PHP 4.3+.
-     *    @param string $command    The actual command line
-     *                              to run.
-     *    @return integer           Exit code.
-     *    @access public
-     */
-    function execute($command) {
-        $this->_output = false;
-        $ret = null;
-        exec($command, $this->_output, $ret);
-        return $ret;
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return string        Output as text.
-     *    @access public
-     */
-    function getOutput() {
-        return implode("\n", $this->_output);
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return array         Output as array of lines.
-     *    @access public
-     */
-    function getOutputAsList() {
-        return $this->_output;
-    }
-}
-
-/**
- *    Test case for testing of command line scripts and
- *    utilities. Usually scripts that are external to the
- *    PHP code, but support it in some way.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ShellTestCase extends SimpleTestCase {
-    var $_current_shell;
-    var $_last_status;
-    var $_last_command;
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function ShellTestCase($label = false) {
-        $this->SimpleTestCase($label);
-        $this->_current_shell = &$this->_createShell();
-        $this->_last_status = false;
-        $this->_last_command = '';
-    }
-
-    /**
-     *    Executes a command and buffers the results.
-     *    @param string $command     Command to run.
-     *    @return boolean            True if zero exit code.
-     *    @access public
-     */
-    function execute($command) {
-        $shell = &$this->_getShell();
-        $this->_last_status = $shell->execute($command);
-        $this->_last_command = $command;
-        return ($this->_last_status === 0);
-    }
-
-    /**
-     *    Dumps the output of the last command.
-     *    @access public
-     */
-    function dumpOutput() {
-        $this->dump($this->getOutput());
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return string        Output as text.
-     *    @access public
-     */
-    function getOutput() {
-        $shell = &$this->_getShell();
-        return $shell->getOutput();
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return array         Output as array of lines.
-     *    @access public
-     */
-    function getOutputAsList() {
-        $shell = &$this->_getShell();
-        return $shell->getOutputAsList();
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = "%s") {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = "%s") {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Tests the last status code from the shell.
-     *    @param integer $status   Expected status of last
-     *                             command.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertExitCode($status, $message = "%s") {
-        $message = sprintf($message, "Expected status code of [$status] from [" .
-                $this->_last_command . "], but got [" .
-                $this->_last_status . "]");
-        return $this->assertTrue($status === $this->_last_status, $message);
-    }
-
-    /**
-     *    Attempt to exactly match the combined STDERR and
-     *    STDOUT output.
-     *    @param string $expected  Expected output.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertOutput($expected, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new EqualExpectation($expected),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    Scans the output for a Perl regex. If found
-     *    anywhere it passes, else it fails.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertOutputPattern($pattern, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    If a Perl regex is found anywhere in the current
-     *    output then a failure is generated, else a pass.
-     *    @param string $pattern    Regex to search for.
-     *    @param $message           Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoOutputPattern($pattern, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    File existence check.
-     *    @param string $path      Full filename and path.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertFileExists($path, $message = "%s") {
-        $message = sprintf($message, "File [$path] should exist");
-        return $this->assertTrue(file_exists($path), $message);
-    }
-
-    /**
-     *    File non-existence check.
-     *    @param string $path      Full filename and path.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertFileNotExists($path, $message = "%s") {
-        $message = sprintf($message, "File [$path] should not exist");
-        return $this->assertFalse(file_exists($path), $message);
-    }
-
-    /**
-     *    Scans a file for a Perl regex. If found
-     *    anywhere it passes, else it fails.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $path       Full filename and path.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertFilePattern($pattern, $path, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new PatternExpectation($pattern),
-                implode('', file($path)),
-                $message);
-    }
-
-    /**
-     *    If a Perl regex is found anywhere in the named
-     *    file then a failure is generated, else a pass.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $path       Full filename and path.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoFilePattern($pattern, $path, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                implode('', file($path)),
-                $message);
-    }
-
-    /**
-     *    Accessor for current shell. Used for testing the
-     *    the tester itself.
-     *    @return Shell        Current shell.
-     *    @access protected
-     */
-    function &_getShell() {
-        return $this->_current_shell;
-    }
-
-    /**
-     *    Factory for the shell to run the command on.
-     *    @return Shell        New shell object.
-     *    @access protected
-     */
-    function &_createShell() {
-        $shell = &new SimpleShell();
-        return $shell;
-    }
-}
-?>
diff --git a/tests/simpletest/simpletest.php b/tests/simpletest/simpletest.php
deleted file mode 100755
index bab2c1a6ac..0000000000
--- a/tests/simpletest/simpletest.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-/**
- *  Global state for SimpleTest and kicker script in future versions.
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: simpletest.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-if (version_compare(phpversion(), '5') >= 0) {
-    require_once(dirname(__FILE__) . '/reflection_php5.php');
-} else {
-    require_once(dirname(__FILE__) . '/reflection_php4.php');
-}
-require_once(dirname(__FILE__) . '/default_reporter.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Registry and test context. Includes a few
- *    global options that I'm slowly getting rid of.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleTest {
-
-    /**
-     *    Reads the SimpleTest version from the release file.
-     *    @return string        Version string.
-     *    @static
-     *    @access public
-     */
-    function getVersion() {
-        $content = file(dirname(__FILE__) . '/VERSION');
-        return trim($content[0]);
-    }
-
-    /**
-     *    Sets the name of a test case to ignore, usually
-     *    because the class is an abstract case that should
-     *    not be run. Once PHP4 is dropped this will disappear
-     *    as a public method and "abstract" will rule.
-     *    @param string $class        Add a class to ignore.
-     *    @static
-     *    @access public
-     */
-    function ignore($class) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['IgnoreList'][strtolower($class)] = true;
-    }
-
-    /**
-     *    Scans the now complete ignore list, and adds
-     *    all parent classes to the list. If a class
-     *    is not a runnable test case, then it's parents
-     *    wouldn't be either. This is syntactic sugar
-     *    to cut down on ommissions of ignore()'s or
-     *    missing abstract declarations. This cannot
-     *    be done whilst loading classes wiithout forcing
-     *    a particular order on the class declarations and
-     *    the ignore() calls. It's just nice to have the ignore()
-     *    calls at the top of the file before the actual declarations.
-     *    @param array $classes     Class names of interest.
-     *    @static
-     *    @access public
-     */
-    function ignoreParentsIfIgnored($classes) {
-        $registry = &SimpleTest::_getRegistry();
-        foreach ($classes as $class) {
-            if (SimpleTest::isIgnored($class)) {
-                $reflection = new SimpleReflection($class);
-                if ($parent = $reflection->getParent()) {
-                    SimpleTest::ignore($parent);
-                }
-            }
-        }
-    }
-
-    /**
-     *   Puts the object to the global pool of 'preferred' objects
-     *   which can be retrieved with SimpleTest :: preferred() method.
-     *   Instances of the same class are overwritten.
-     *   @param object $object      Preferred object
-     *   @static
-     *   @access public
-     *   @see preferred()
-     */
-    function prefer(&$object) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['Preferred'][] = &$object;
-    }
-
-    /**
-     *   Retrieves 'preferred' objects from global pool. Class filter
-     *   can be applied in order to retrieve the object of the specific
-     *   class
-     *   @param array|string $classes       Allowed classes or interfaces.
-     *   @static
-     *   @access public
-     *   @return array|object|null
-     *   @see prefer()
-     */
-    function &preferred($classes) {
-        if (! is_array($classes)) {
-            $classes = array($classes);
-        }
-        $registry = &SimpleTest::_getRegistry();
-        for ($i = count($registry['Preferred']) - 1; $i >= 0; $i--) {
-            foreach ($classes as $class) {
-                if (SimpleTestCompatibility::isA($registry['Preferred'][$i], $class)) {
-                    return $registry['Preferred'][$i];
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Test to see if a test case is in the ignore
-     *    list. Quite obviously the ignore list should
-     *    be a separate object and will be one day.
-     *    This method is internal to SimpleTest. Don't
-     *    use it.
-     *    @param string $class        Class name to test.
-     *    @return boolean             True if should not be run.
-     *    @access public
-     *    @static
-     */
-    function isIgnored($class) {
-        $registry = &SimpleTest::_getRegistry();
-        return isset($registry['IgnoreList'][strtolower($class)]);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function setMockBaseClass($mock_base) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['MockBaseClass'] = $mock_base;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getMockBaseClass() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['MockBaseClass'];
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set host
-     *    to false to disable. This will take effect
-     *    if there are no other proxy settings.
-     *    @param string $proxy     Proxy host as URL.
-     *    @param string $username  Proxy username for authentication.
-     *    @param string $password  Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['DefaultProxy'] = $proxy;
-        $registry['DefaultProxyUsername'] = $username;
-        $registry['DefaultProxyPassword'] = $password;
-    }
-
-    /**
-     *    Accessor for default proxy host.
-     *    @return string       Proxy URL.
-     *    @access public
-     */
-    function getDefaultProxy() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['DefaultProxy'];
-    }
-
-    /**
-     *    Accessor for default proxy username.
-     *    @return string    Proxy username for authentication.
-     *    @access public
-     */
-    function getDefaultProxyUsername() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['DefaultProxyUsername'];
-    }
-
-    /**
-     *    Accessor for default proxy password.
-     *    @return string    Proxy password for authentication.
-     *    @access public
-     */
-    function getDefaultProxyPassword() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['DefaultProxyPassword'];
-    }
-
-    /**
-     *    Accessor for global registry of options.
-     *    @return hash           All stored values.
-     *    @access private
-     *    @static
-     */
-    function &_getRegistry() {
-        static $registry = false;
-        if (! $registry) {
-            $registry = SimpleTest::_getDefaults();
-        }
-        return $registry;
-    }
-
-    /**
-     *    Accessor for the context of the current
-     *    test run.
-     *    @return SimpleTestContext    Current test run.
-     *    @access public
-     *    @static
-     */
-    function &getContext() {
-        static $context = false;
-        if (! $context) {
-            $context = new SimpleTestContext();
-        }
-        return $context;
-    }
-
-    /**
-     *    Constant default values.
-     *    @return hash       All registry defaults.
-     *    @access private
-     *    @static
-     */
-    function _getDefaults() {
-        return array(
-                'StubBaseClass' => 'SimpleStub',
-                'MockBaseClass' => 'SimpleMock',
-                'IgnoreList' => array(),
-                'DefaultProxy' => false,
-                'DefaultProxyUsername' => false,
-                'DefaultProxyPassword' => false,
-                'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
-    }
-}
-
-/**
- *    Container for all components for a specific
- *    test run. Makes things like error queues
- *    available to PHP event handlers, and also
- *    gets around some nasty reference issues in
- *    the mocks.
- *    @package  SimpleTest
- */
-class SimpleTestContext {
-    var $_test;
-    var $_reporter;
-    var $_resources;
-
-    /**
-     *    Clears down the current context.
-     *    @access public
-     */
-    function clear() {
-        $this->_resources = array();
-    }
-
-    /**
-     *    Sets the current test case instance. This
-     *    global instance can be used by the mock objects
-     *    to send message to the test cases.
-     *    @param SimpleTestCase $test        Test case to register.
-     *    @access public
-     */
-    function setTest(&$test) {
-        $this->clear();
-        $this->_test = &$test;
-    }
-
-    /**
-     *    Accessor for currently running test case.
-     *    @return SimpleTestCase    Current test.
-     *    @access public
-     */
-    function &getTest() {
-        return $this->_test;
-    }
-
-    /**
-     *    Sets the current reporter. This
-     *    global instance can be used by the mock objects
-     *    to send messages.
-     *    @param SimpleReporter $reporter     Reporter to register.
-     *    @access public
-     */
-    function setReporter(&$reporter) {
-        $this->clear();
-        $this->_reporter = &$reporter;
-    }
-
-    /**
-     *    Accessor for current reporter.
-     *    @return SimpleReporter    Current reporter.
-     *    @access public
-     */
-    function &getReporter() {
-        return $this->_reporter;
-    }
-
-    /**
-     *    Accessor for the Singleton resource.
-     *    @return object       Global resource.
-     *    @access public
-     *    @static
-     */
-    function &get($resource) {
-        if (! isset($this->_resources[$resource])) {
-            $this->_resources[$resource] = &new $resource();
-        }
-        return $this->_resources[$resource];
-    }
-}
-
-/**
- *    Interrogates the stack trace to recover the
- *    failure point.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleStackTrace {
-    var $_prefixes;
-
-    /**
-     *    Stashes the list of target prefixes.
-     *    @param array $prefixes      List of method prefixes
-     *                                to search for.
-     */
-    function SimpleStackTrace($prefixes) {
-        $this->_prefixes = $prefixes;
-    }
-
-    /**
-     *    Extracts the last method name that was not within
-     *    Simpletest itself. Captures a stack trace if none given.
-     *    @param array $stack      List of stack frames.
-     *    @return string           Snippet of test report with line
-     *                             number and file.
-     *    @access public
-     */
-    function traceMethod($stack = false) {
-        $stack = $stack ? $stack : $this->_captureTrace();
-        foreach ($stack as $frame) {
-            if ($this->_frameLiesWithinSimpleTestFolder($frame)) {
-                continue;
-            }
-            if ($this->_frameMatchesPrefix($frame)) {
-                return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
-            }
-        }
-        return '';
-    }
-
-    /**
-     *    Test to see if error is generated by SimpleTest itself.
-     *    @param array $frame     PHP stack frame.
-     *    @return boolean         True if a SimpleTest file.
-     *    @access private
-     */
-    function _frameLiesWithinSimpleTestFolder($frame) {
-        if (isset($frame['file'])) {
-            $path = substr(SIMPLE_TEST, 0, -1);
-            if (strpos($frame['file'], $path) === 0) {
-                if (dirname($frame['file']) == $path) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Tries to determine if the method call is an assert, etc.
-     *    @param array $frame     PHP stack frame.
-     *    @return boolean         True if matches a target.
-     *    @access private
-     */
-    function _frameMatchesPrefix($frame) {
-        foreach ($this->_prefixes as $prefix) {
-            if (strncmp($frame['function'], $prefix, strlen($prefix)) == 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Grabs a current stack trace.
-     *    @return array        Fulle trace.
-     *    @access private
-     */
-    function _captureTrace() {
-        if (function_exists('debug_backtrace')) {
-            return array_reverse(debug_backtrace());
-        }
-        return array();
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @deprecated
- */
-class SimpleTestOptions extends SimpleTest {
-
-    /**
-     *    @deprecated
-     */
-    function getVersion() {
-        return Simpletest::getVersion();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function ignore($class) {
-        return Simpletest::ignore($class);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function isIgnored($class) {
-        return Simpletest::isIgnored($class);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function setMockBaseClass($mock_base) {
-        return Simpletest::setMockBaseClass($mock_base);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getMockBaseClass() {
-        return Simpletest::getMockBaseClass();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        return Simpletest::useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getDefaultProxy() {
-        return Simpletest::getDefaultProxy();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getDefaultProxyUsername() {
-        return Simpletest::getDefaultProxyUsername();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getDefaultProxyPassword() {
-        return Simpletest::getDefaultProxyPassword();
-    }
-}
-?>
diff --git a/tests/simpletest/socket.php b/tests/simpletest/socket.php
deleted file mode 100755
index 1ba7891657..0000000000
--- a/tests/simpletest/socket.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: socket.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Stashes an error for later. Useful for constructors
- *    until PHP gets exceptions.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleStickyError {
-    var $_error = 'Constructor not chained';
-
-    /**
-     *    Sets the error to empty.
-     *    @access public
-     */
-    function SimpleStickyError() {
-        $this->_clearError();
-    }
-
-    /**
-     *    Test for an outstanding error.
-     *    @return boolean           True if there is an error.
-     *    @access public
-     */
-    function isError() {
-        return ($this->_error != '');
-    }
-
-    /**
-     *    Accessor for an outstanding error.
-     *    @return string     Empty string if no error otherwise
-     *                       the error message.
-     *    @access public
-     */
-    function getError() {
-        return $this->_error;
-    }
-
-    /**
-     *    Sets the internal error.
-     *    @param string       Error message to stash.
-     *    @access protected
-     */
-    function _setError($error) {
-        $this->_error = $error;
-    }
-
-    /**
-     *    Resets the error state to no error.
-     *    @access protected
-     */
-    function _clearError() {
-        $this->_setError('');
-    }
-}
-
-/**
- *    Wrapper for TCP/IP socket.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSocket extends SimpleStickyError {
-    var $_handle;
-    var $_is_open = false;
-    var $_sent = '';
-    var $lock_size;
-
-    /**
-     *    Opens a socket for reading and writing.
-     *    @param string $host          Hostname to send request to.
-     *    @param integer $port         Port on remote machine to open.
-     *    @param integer $timeout      Connection timeout in seconds.
-     *    @param integer $block_size   Size of chunk to read.
-     *    @access public
-     */
-    function SimpleSocket($host, $port, $timeout, $block_size = 255) {
-        $this->SimpleStickyError();
-        $error_number = 0;
-        $error = '';
-        if (! ($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
-            $this->_setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
-            return;
-        }
-        $this->_is_open = true;
-        $this->_block_size = $block_size;
-        SimpleTestCompatibility::setTimeout($this->_handle, $timeout);
-    }
-
-    /**
-     *    Writes some data to the socket and saves alocal copy.
-     *    @param string $message       String to send to socket.
-     *    @return boolean              True if successful.
-     *    @access public
-     */
-    function write($message) {
-        if ($this->isError() || ! $this->isOpen()) {
-            return false;
-        }
-        $count = fwrite($this->_handle, $message);
-        if (! $count) {
-            if ($count === false) {
-                $this->_setError('Cannot write to socket');
-                $this->close();
-            }
-            return false;
-        }
-        fflush($this->_handle);
-        $this->_sent .= $message;
-        return true;
-    }
-
-    /**
-     *    Reads data from the socket. The error suppresion
-     *    is a workaround for PHP4 always throwing a warning
-     *    with a secure socket.
-     *    @return integer/boolean           Incoming bytes. False
-     *                                     on error.
-     *    @access public
-     */
-    function read() {
-        if ($this->isError() || ! $this->isOpen()) {
-            return false;
-        }
-        $raw = @fread($this->_handle, $this->_block_size);
-        if ($raw === false) {
-            $this->_setError('Cannot read from socket');
-            $this->close();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for socket open state.
-     *    @return boolean           True if open.
-     *    @access public
-     */
-    function isOpen() {
-        return $this->_is_open;
-    }
-
-    /**
-     *    Closes the socket preventing further reads.
-     *    Cannot be reopened once closed.
-     *    @return boolean           True if successful.
-     *    @access public
-     */
-    function close() {
-        $this->_is_open = false;
-        return fclose($this->_handle);
-    }
-
-    /**
-     *    Accessor for content so far.
-     *    @return string        Bytes sent only.
-     *    @access public
-     */
-    function getSent() {
-        return $this->_sent;
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param string $host          Host to connect to.
-     *    @param integer $port         Port on host.
-     *    @param integer $error_number Recipient of error code.
-     *    @param string $error         Recipoent of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    function _openSocket($host, $port, &$error_number, &$error, $timeout) {
-        return @fsockopen($host, $port, $error_number, $error, $timeout);
-    }
-}
-
-/**
- *    Wrapper for TCP/IP socket over TLS.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSecureSocket extends SimpleSocket {
-
-    /**
-     *    Opens a secure socket for reading and writing.
-     *    @param string $host      Hostname to send request to.
-     *    @param integer $port     Port on remote machine to open.
-     *    @param integer $timeout  Connection timeout in seconds.
-     *    @access public
-     */
-    function SimpleSecureSocket($host, $port, $timeout) {
-        $this->SimpleSocket($host, $port, $timeout);
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param string $host          Host to connect to.
-     *    @param integer $port         Port on host.
-     *    @param integer $error_number Recipient of error code.
-     *    @param string $error         Recipient of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    function _openSocket($host, $port, &$error_number, &$error, $timeout) {
-        return parent::_openSocket("tls://$host", $port, $error_number, $error, $timeout);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/tag.php b/tests/simpletest/tag.php
deleted file mode 100755
index 100313da97..0000000000
--- a/tests/simpletest/tag.php
+++ /dev/null
@@ -1,1418 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: tag.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/parser.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    HTML or XML tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTag {
-    var $_name;
-    var $_attributes;
-    var $_content;
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param string $name        Tag name.
-     *    @param hash $attributes    Attribute names and
-     *                               string values. Note that
-     *                               the keys must have been
-     *                               converted to lower case.
-     */
-    function SimpleTag($name, $attributes) {
-        $this->_name = strtolower(trim($name));
-        $this->_attributes = $attributes;
-        $this->_content = '';
-    }
-
-    /**
-     *    Check to see if the tag can have both start and
-     *    end tags with content in between.
-     *    @return boolean        True if content allowed.
-     *    @access public
-     */
-    function expectEndTag() {
-        return true;
-    }
-
-    /**
-     *    The current tag should not swallow all content for
-     *    itself as it's searchable page content. Private
-     *    content tags are usually widgets that contain default
-     *    values.
-     *    @return boolean        False as content is available
-     *                           to other tags by default.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return false;
-    }
-
-    /**
-     *    Appends string content to the current content.
-     *    @param string $content        Additional text.
-     *    @access public
-     */
-    function addContent($content) {
-        $this->_content .= (string)$content;
-    }
-
-    /**
-     *    Adds an enclosed tag to the content.
-     *    @param SimpleTag $tag    New tag.
-     *    @access public
-     */
-    function addTag(&$tag) {
-    }
-
-    /**
-     *    Accessor for tag name.
-     *    @return string       Name of tag.
-     *    @access public
-     */
-    function getTagName() {
-        return $this->_name;
-    }
-
-    /**
-     *    List of legal child elements.
-     *    @return array        List of element names.
-     *    @access public
-     */
-    function getChildElements() {
-        return array();
-    }
-
-    /**
-     *    Accessor for an attribute.
-     *    @param string $label    Attribute name.
-     *    @return string          Attribute value.
-     *    @access public
-     */
-    function getAttribute($label) {
-        $label = strtolower($label);
-        if (! isset($this->_attributes[$label])) {
-            return false;
-        }
-        return (string)$this->_attributes[$label];
-    }
-
-    /**
-     *    Sets an attribute.
-     *    @param string $label    Attribute name.
-     *    @return string $value   New attribute value.
-     *    @access protected
-     */
-    function _setAttribute($label, $value) {
-        $this->_attributes[strtolower($label)] = $value;
-    }
-
-    /**
-     *    Accessor for the whole content so far.
-     *    @return string       Content as big raw string.
-     *    @access public
-     */
-    function getContent() {
-        return $this->_content;
-    }
-
-    /**
-     *    Accessor for content reduced to visible text. Acts
-     *    like a text mode browser, normalising space and
-     *    reducing images to their alt text.
-     *    @return string       Content as plain text.
-     *    @access public
-     */
-    function getText() {
-        return SimpleHtmlSaxParser::normalise($this->_content);
-    }
-
-    /**
-     *    Test to see if id attribute matches.
-     *    @param string $id        ID to test against.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isId($id) {
-        return ($this->getAttribute('id') == $id);
-    }
-}
-
-/**
- *    Base url.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBaseTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleBaseTag($attributes) {
-        $this->SimpleTag('base', $attributes);
-    }
-
-    /**
-     *    Base tag is not a block tag.
-     *    @return boolean       false
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-}
-
-/**
- *    Page title.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTitleTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleTitleTag($attributes) {
-        $this->SimpleTag('title', $attributes);
-    }
-}
-
-/**
- *    Link.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAnchorTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleAnchorTag($attributes) {
-        $this->SimpleTag('a', $attributes);
-    }
-
-    /**
-     *    Accessor for URL as string.
-     *    @return string    Coerced as string.
-     *    @access public
-     */
-    function getHref() {
-        $url = $this->getAttribute('href');
-        if (is_bool($url)) {
-            $url = '';
-        }
-        return $url;
-    }
-}
-
-/**
- *    Form element.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleWidget extends SimpleTag {
-    var $_value;
-    var $_label;
-    var $_is_set;
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param string $name        Tag name.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleWidget($name, $attributes) {
-        $this->SimpleTag($name, $attributes);
-        $this->_value = false;
-        $this->_label = false;
-        $this->_is_set = false;
-    }
-
-    /**
-     *    Accessor for name submitted as the key in
-     *    GET/POST variables hash.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getName() {
-        return $this->getAttribute('name');
-    }
-
-    /**
-     *    Accessor for default value parsed with the tag.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        return $this->getAttribute('value');
-    }
-
-    /**
-     *    Accessor for currently set value or default if
-     *    none.
-     *    @return string      Value set by form or default
-     *                        if none.
-     *    @access public
-     */
-    function getValue() {
-        if (! $this->_is_set) {
-            return $this->getDefault();
-        }
-        return $this->_value;
-    }
-
-    /**
-     *    Sets the current form element value.
-     *    @param string $value       New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        $this->_value = $value;
-        $this->_is_set = true;
-        return true;
-    }
-
-    /**
-     *    Resets the form element value back to the
-     *    default.
-     *    @access public
-     */
-    function resetValue() {
-        $this->_is_set = false;
-    }
-
-    /**
-     *    Allows setting of a label externally, say by a
-     *    label tag.
-     *    @param string $label    Label to attach.
-     *    @access public
-     */
-    function setLabel($label) {
-        $this->_label = trim($label);
-    }
-
-    /**
-     *    Reads external or internal label.
-     *    @param string $label    Label to test.
-     *    @return boolean         True is match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return $this->_label == trim($label);
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write(&$encoding) {
-        if ($this->getName()) {
-            $encoding->add($this->getName(), $this->getValue());
-        }
-    }
-}
-
-/**
- *    Text, password and hidden field.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTextTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleTextTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', '');
-        }
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Sets the current form element value. Cannot
-     *    change the value of a hidden field.
-     *    @param string $value       New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($this->getAttribute('type') == 'hidden') {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-}
-
-/**
- *    Submit button as input tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSubmitTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleSubmitTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', 'Submit');
-        }
-    }
-
-    /**
-     *    Tag contains no end element.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->getValue();
-    }
-
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-}
-
-/**
- *    Image button as input tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleImageSubmitTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleImageSubmitTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-    }
-
-    /**
-     *    Tag contains no end element.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        if ($this->getAttribute('title')) {
-            return $this->getAttribute('title');
-        }
-        return $this->getAttribute('alt');
-    }
-
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @param integer $x                  X coordinate of click.
-     *    @param integer $y                  Y coordinate of click.
-     *    @access public
-     */
-    function write(&$encoding, $x, $y) {
-        if ($this->getName()) {
-            $encoding->add($this->getName() . '.x', $x);
-            $encoding->add($this->getName() . '.y', $y);
-        } else {
-            $encoding->add('x', $x);
-            $encoding->add('y', $y);
-        }
-    }
-}
-
-/**
- *    Submit button as button tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleButtonTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    Defaults are very browser dependent.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleButtonTag($attributes) {
-        $this->SimpleWidget('button', $attributes);
-    }
-
-    /**
-     *    Check to see if the tag can have both start and
-     *    end tags with content in between.
-     *    @return boolean        True if content allowed.
-     *    @access public
-     */
-    function expectEndTag() {
-        return true;
-    }
-
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->getContent();
-    }
-
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-}
-
-/**
- *    Content tag for text area.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTextAreaTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleTextAreaTag($attributes) {
-        $this->SimpleWidget('textarea', $attributes);
-    }
-
-    /**
-     *    Accessor for starting value.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
-    }
-
-    /**
-     *    Applies word wrapping if needed.
-     *    @param string $value      New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return parent::setValue($this->_wrap($value));
-    }
-
-    /**
-     *    Test to see if text should be wrapped.
-     *    @return boolean        True if wrapping on.
-     *    @access private
-     */
-    function _wrapIsEnabled() {
-        if ($this->getAttribute('cols')) {
-            $wrap = $this->getAttribute('wrap');
-            if (($wrap == 'physical') || ($wrap == 'hard')) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Performs the formatting that is peculiar to
-     *    this tag. There is strange behaviour in this
-     *    one, including stripping a leading new line.
-     *    Go figure. I am using Firefox as a guide.
-     *    @param string $text    Text to wrap.
-     *    @return string         Text wrapped with carriage
-     *                           returns and line feeds
-     *    @access private
-     */
-    function _wrap($text) {
-        $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
-        $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
-        if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
-            $text = substr($text, strlen("\r\n"));
-        }
-        if ($this->_wrapIsEnabled()) {
-            return wordwrap(
-                    $text,
-                    (integer)$this->getAttribute('cols'),
-                    "\r\n");
-        }
-        return $text;
-    }
-
-    /**
-     *    The content of textarea is not part of the page.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return true;
-    }
-}
-
-/**
- *    File upload widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUploadTag extends SimpleWidget {
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleUploadTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write(&$encoding) {
-        if (! file_exists($this->getValue())) {
-            return;
-        }
-        $encoding->attach(
-                $this->getName(),
-                implode('', file($this->getValue())),
-                basename($this->getValue()));
-    }
-}
-
-/**
- *    Drop down widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSelectionTag extends SimpleWidget {
-    var $_options;
-    var $_choice;
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleSelectionTag($attributes) {
-        $this->SimpleWidget('select', $attributes);
-        $this->_options = array();
-        $this->_choice = false;
-    }
-
-    /**
-     *    Adds an option tag to a selection field.
-     *    @param SimpleOptionTag $tag     New option.
-     *    @access public
-     */
-    function addTag(&$tag) {
-        if ($tag->getTagName() == 'option') {
-            $this->_options[] = &$tag;
-        }
-    }
-
-    /**
-     *    Text within the selection element is ignored.
-     *    @param string $content        Ignored.
-     *    @access public
-     */
-    function addContent($content) {
-    }
-
-    /**
-     *    Scans options for defaults. If none, then
-     *    the first option is selected.
-     *    @return string        Selected field.
-     *    @access public
-     */
-    function getDefault() {
-        for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-            if ($this->_options[$i]->getAttribute('selected') !== false) {
-                return $this->_options[$i]->getDefault();
-            }
-        }
-        if ($count > 0) {
-            return $this->_options[0]->getDefault();
-        }
-        return '';
-    }
-
-    /**
-     *    Can only set allowed values.
-     *    @param string $value       New choice.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-            if ($this->_options[$i]->isValue($value)) {
-                $this->_choice = $i;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current selection value.
-     *    @return string      Value attribute or
-     *                        content of opton.
-     *    @access public
-     */
-    function getValue() {
-        if ($this->_choice === false) {
-            return $this->getDefault();
-        }
-        return $this->_options[$this->_choice]->getValue();
-    }
-}
-
-/**
- *    Drop down widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class MultipleSelectionTag extends SimpleWidget {
-    var $_options;
-    var $_values;
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function MultipleSelectionTag($attributes) {
-        $this->SimpleWidget('select', $attributes);
-        $this->_options = array();
-        $this->_values = false;
-    }
-
-    /**
-     *    Adds an option tag to a selection field.
-     *    @param SimpleOptionTag $tag     New option.
-     *    @access public
-     */
-    function addTag(&$tag) {
-        if ($tag->getTagName() == 'option') {
-            $this->_options[] = &$tag;
-        }
-    }
-
-    /**
-     *    Text within the selection element is ignored.
-     *    @param string $content        Ignored.
-     *    @access public
-     */
-    function addContent($content) {
-    }
-
-    /**
-     *    Scans options for defaults to populate the
-     *    value array().
-     *    @return array        Selected fields.
-     *    @access public
-     */
-    function getDefault() {
-        $default = array();
-        for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-            if ($this->_options[$i]->getAttribute('selected') !== false) {
-                $default[] = $this->_options[$i]->getDefault();
-            }
-        }
-        return $default;
-    }
-
-    /**
-     *    Can only set allowed values. Any illegal value
-     *    will result in a failure, but all correct values
-     *    will be set.
-     *    @param array $desired      New choices.
-     *    @return boolean            True if all allowed.
-     *    @access public
-     */
-    function setValue($desired) {
-        $achieved = array();
-        foreach ($desired as $value) {
-            $success = false;
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->isValue($value)) {
-                    $achieved[] = $this->_options[$i]->getValue();
-                    $success = true;
-                    break;
-                }
-            }
-            if (! $success) {
-                return false;
-            }
-        }
-        $this->_values = $achieved;
-        return true;
-    }
-
-    /**
-     *    Accessor for current selection value.
-     *    @return array      List of currently set options.
-     *    @access public
-     */
-    function getValue() {
-        if ($this->_values === false) {
-            return $this->getDefault();
-        }
-        return $this->_values;
-    }
-}
-
-/**
- *    Option for selection field.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleOptionTag extends SimpleWidget {
-
-    /**
-     *    Stashes the attributes.
-     */
-    function SimpleOptionTag($attributes) {
-        $this->SimpleWidget('option', $attributes);
-    }
-
-    /**
-     *    Does nothing.
-     *    @param string $value      Ignored.
-     *    @return boolean           Not allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Test to see if a value matches the option.
-     *    @param string $compare    Value to compare with.
-     *    @return boolean           True if possible match.
-     *    @access public
-     */
-    function isValue($compare) {
-        $compare = trim($compare);
-        if (trim($this->getValue()) == $compare) {
-            return true;
-        }
-        return trim($this->getContent()) == $compare;
-    }
-
-    /**
-     *    Accessor for starting value. Will be set to
-     *    the option label if no value exists.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('value') === false) {
-            return $this->getContent();
-        }
-        return $this->getAttribute('value');
-    }
-
-    /**
-     *    The content of options is not part of the page.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return true;
-    }
-}
-
-/**
- *    Radio button.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRadioButtonTag extends SimpleWidget {
-
-    /**
-     *    Stashes the attributes.
-     *    @param array $attributes        Hash of attributes.
-     */
-    function SimpleRadioButtonTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', 'on');
-        }
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    The only allowed value sn the one in the
-     *    "value" attribute.
-     *    @param string $value      New value.
-     *    @return boolean           True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($value === false) {
-            return parent::setValue($value);
-        }
-        if ($value != $this->getAttribute('value')) {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-
-    /**
-     *    Accessor for starting value.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('checked') !== false) {
-            return $this->getAttribute('value');
-        }
-        return false;
-    }
-}
-
-/**
- *    Checkbox widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCheckboxTag extends SimpleWidget {
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleCheckboxTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', 'on');
-        }
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    The only allowed value in the one in the
-     *    "value" attribute. The default for this
-     *    attribute is "on". If this widget is set to
-     *    true, then the usual value will be taken.
-     *    @param string $value      New value.
-     *    @return boolean           True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($value === false) {
-            return parent::setValue($value);
-        }
-        if ($value === true) {
-            return parent::setValue($this->getAttribute('value'));
-        }
-        if ($value != $this->getAttribute('value')) {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-
-    /**
-     *    Accessor for starting value. The default
-     *    value is "on".
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('checked') !== false) {
-            return $this->getAttribute('value');
-        }
-        return false;
-    }
-}
-
-/**
- *    A group of multiple widgets with some shared behaviour.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTagGroup {
-    var $_widgets = array();
-
-    /**
-     *    Adds a tag to the group.
-     *    @param SimpleWidget $widget
-     *    @access public
-     */
-    function addWidget(&$widget) {
-        $this->_widgets[] = &$widget;
-    }
-
-    /**
-     *    Accessor to widget set.
-     *    @return array        All widgets.
-     *    @access protected
-     */
-    function &_getWidgets() {
-        return $this->_widgets;
-    }
-
-    /**
-     *    Accessor for an attribute.
-     *    @param string $label    Attribute name.
-     *    @return boolean         Always false.
-     *    @access public
-     */
-    function getAttribute($label) {
-        return false;
-    }
-
-    /**
-     *    Fetches the name for the widget from the first
-     *    member.
-     *    @return string        Name of widget.
-     *    @access public
-     */
-    function getName() {
-        if (count($this->_widgets) > 0) {
-            return $this->_widgets[0]->getName();
-        }
-    }
-
-    /**
-     *    Scans the widgets for one with the appropriate
-     *    ID field.
-     *    @param string $id        ID value to try.
-     *    @return boolean          True if matched.
-     *    @access public
-     */
-    function isId($id) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($this->_widgets[$i]->isId($id)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Scans the widgets for one with the appropriate
-     *    attached label.
-     *    @param string $label     Attached label to try.
-     *    @return boolean          True if matched.
-     *    @access public
-     */
-    function isLabel($label) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($this->_widgets[$i]->isLabel($label)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write(&$encoding) {
-        $encoding->add($this->getName(), $this->getValue());
-    }
-}
-
-/**
- *    A group of tags with the same name within a form.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCheckboxGroup extends SimpleTagGroup {
-
-    /**
-     *    Accessor for current selected widget or false
-     *    if none.
-     *    @return string/array     Widget values or false if none.
-     *    @access public
-     */
-    function getValue() {
-        $values = array();
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getValue() !== false) {
-                $values[] = $widgets[$i]->getValue();
-            }
-        }
-        return $this->_coerceValues($values);
-    }
-
-    /**
-     *    Accessor for starting value that is active.
-     *    @return string/array      Widget values or false if none.
-     *    @access public
-     */
-    function getDefault() {
-        $values = array();
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getDefault() !== false) {
-                $values[] = $widgets[$i]->getDefault();
-            }
-        }
-        return $this->_coerceValues($values);
-    }
-
-    /**
-     *    Accessor for current set values.
-     *    @param string/array/boolean $values   Either a single string, a
-     *                                          hash or false for nothing set.
-     *    @return boolean                       True if all values can be set.
-     *    @access public
-     */
-    function setValue($values) {
-        $values = $this->_makeArray($values);
-        if (! $this->_valuesArePossible($values)) {
-            return false;
-        }
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            $possible = $widgets[$i]->getAttribute('value');
-            if (in_array($widgets[$i]->getAttribute('value'), $values)) {
-                $widgets[$i]->setValue($possible);
-            } else {
-                $widgets[$i]->setValue(false);
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests to see if a possible value set is legal.
-     *    @param string/array/boolean $values   Either a single string, a
-     *                                          hash or false for nothing set.
-     *    @return boolean                       False if trying to set a
-     *                                          missing value.
-     *    @access private
-     */
-    function _valuesArePossible($values) {
-        $matches = array();
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            $possible = $widgets[$i]->getAttribute('value');
-            if (in_array($possible, $values)) {
-                $matches[] = $possible;
-            }
-        }
-        return ($values == $matches);
-    }
-
-    /**
-     *    Converts the output to an appropriate format. This means
-     *    that no values is false, a single value is just that
-     *    value and only two or more are contained in an array.
-     *    @param array $values           List of values of widgets.
-     *    @return string/array/boolean   Expected format for a tag.
-     *    @access private
-     */
-    function _coerceValues($values) {
-        if (count($values) == 0) {
-            return false;
-        } elseif (count($values) == 1) {
-            return $values[0];
-        } else {
-            return $values;
-        }
-    }
-
-    /**
-     *    Converts false or string into array. The opposite of
-     *    the coercian method.
-     *    @param string/array/boolean $value  A single item is converted
-     *                                        to a one item list. False
-     *                                        gives an empty list.
-     *    @return array                       List of values, possibly empty.
-     *    @access private
-     */
-    function _makeArray($value) {
-        if ($value === false) {
-            return array();
-        }
-        if (is_string($value)) {
-            return array($value);
-        }
-        return $value;
-    }
-}
-
-/**
- *    A group of tags with the same name within a form.
- *    Used for radio buttons.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRadioGroup extends SimpleTagGroup {
-
-    /**
-     *    Each tag is tried in turn until one is
-     *    successfully set. The others will be
-     *    unchecked if successful.
-     *    @param string $value      New value.
-     *    @return boolean           True if any allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if (! $this->_valueIsPossible($value)) {
-            return false;
-        }
-        $index = false;
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if (! $widgets[$i]->setValue($value)) {
-                $widgets[$i]->setValue(false);
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests to see if a value is allowed.
-     *    @param string    Attempted value.
-     *    @return boolean  True if a valid value.
-     *    @access private
-     */
-    function _valueIsPossible($value) {
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getAttribute('value') == $value) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current selected widget or false
-     *    if none.
-     *    @return string/boolean   Value attribute or
-     *                             content of opton.
-     *    @access public
-     */
-    function getValue() {
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getValue() !== false) {
-                return $widgets[$i]->getValue();
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for starting value that is active.
-     *    @return string/boolean      Value of first checked
-     *                                widget or false if none.
-     *    @access public
-     */
-    function getDefault() {
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getDefault() !== false) {
-                return $widgets[$i]->getDefault();
-            }
-        }
-        return false;
-    }
-}
-
-/**
- *    Tag to keep track of labels.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleLabelTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleLabelTag($attributes) {
-        $this->SimpleTag('label', $attributes);
-    }
-
-    /**
-     *    Access for the ID to attach the label to.
-     *    @return string        For attribute.
-     *    @access public
-     */
-    function getFor() {
-        return $this->getAttribute('for');
-    }
-}
-
-/**
- *    Tag to aid parsing the form.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFormTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleFormTag($attributes) {
-        $this->SimpleTag('form', $attributes);
-    }
-}
-
-/**
- *    Tag to aid parsing the frames in a page.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFrameTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleFrameTag($attributes) {
-        $this->SimpleTag('frame', $attributes);
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test_case.php b/tests/simpletest/test_case.php
deleted file mode 100755
index 00431dcf4d..0000000000
--- a/tests/simpletest/test_case.php
+++ /dev/null
@@ -1,709 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: test_case.php 1726 2008-04-08 01:20:10Z lastcraft $
- */
-
-/**#@+
- * Includes SimpleTest files and defined the root constant
- * for dependent libraries.
- */
-require_once(dirname(__FILE__) . '/invoker.php');
-require_once(dirname(__FILE__) . '/errors.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/simpletest.php');
-if (version_compare(phpversion(), '5') >= 0) {
-    require_once(dirname(__FILE__) . '/exceptions.php');
-    require_once(dirname(__FILE__) . '/reflection_php5.php');
-} else {
-    require_once(dirname(__FILE__) . '/reflection_php4.php');
-}
-if (! defined('SIMPLE_TEST')) {
-    /**
-     * @ignore
-     */
-    define('SIMPLE_TEST', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-/**#@-*/
-
-/**
- *    Basic test case. This is the smallest unit of a test
- *    suite. It searches for
- *    all methods that start with the the string "test" and
- *    runs them. Working test cases extend this class.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleTestCase {
-    var $_label = false;
-    var $_reporter;
-    var $_observers;
-    var $_should_skip = false;
-
-    /**
-     *    Sets up the test with no display.
-     *    @param string $label    If no test name is given then
-     *                            the class name is used.
-     *    @access public
-     */
-    function SimpleTestCase($label = false) {
-        if ($label) {
-            $this->_label = $label;
-        }
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_label ? $this->_label : get_class($this);
-    }
-
-    /**
-     *    This is a placeholder for skipping tests. In this
-     *    method you place skipIf() and skipUnless() calls to
-     *    set the skipping state.
-     *    @access public
-     */
-    function skip() {
-    }
-
-    /**
-     *    Will issue a message to the reporter and tell the test
-     *    case to skip if the incoming flag is true.
-     *    @param string $should_skip    Condition causing the tests to be skipped.
-     *    @param string $message        Text of skip condition.
-     *    @access public
-     */
-    function skipIf($should_skip, $message = '%s') {
-        if ($should_skip && ! $this->_should_skip) {
-            $this->_should_skip = true;
-            $message = sprintf($message, 'Skipping [' . get_class($this) . ']');
-            $this->_reporter->paintSkip($message . $this->getAssertionLine());
-        }
-    }
-
-    /**
-     *    Will issue a message to the reporter and tell the test
-     *    case to skip if the incoming flag is false.
-     *    @param string $shouldnt_skip  Condition causing the tests to be run.
-     *    @param string $message        Text of skip condition.
-     *    @access public
-     */
-    function skipUnless($shouldnt_skip, $message = false) {
-        $this->skipIf(! $shouldnt_skip, $message);
-    }
-
-    /**
-     *    Used to invoke the single tests.
-     *    @return SimpleInvoker        Individual test runner.
-     *    @access public
-     */
-    function &createInvoker() {
-        $invoker = &new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
-        if (version_compare(phpversion(), '5') >= 0) {
-            $invoker = &new SimpleExceptionTrappingInvoker($invoker);
-        }
-        return $invoker;
-    }
-
-    /**
-     *    Uses reflection to run every method within itself
-     *    starting with the string "test" unless a method
-     *    is specified.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @return boolean                    True if all tests passed.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $context = &SimpleTest::getContext();
-        $context->setTest($this);
-        $context->setReporter($reporter);
-        $this->_reporter = &$reporter;
-        $started = false;
-        foreach ($this->getTests() as $method) {
-            if ($reporter->shouldInvoke($this->getLabel(), $method)) {
-                $this->skip();
-                if ($this->_should_skip) {
-                    break;
-                }
-                if (! $started) {
-                    $reporter->paintCaseStart($this->getLabel());
-                    $started = true;
-                }
-                $invoker = &$this->_reporter->createInvoker($this->createInvoker());
-                $invoker->before($method);
-                $invoker->invoke($method);
-                $invoker->after($method);
-            }
-        }
-        if ($started) {
-            $reporter->paintCaseEnd($this->getLabel());
-        }
-        unset($this->_reporter);
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Gets a list of test names. Normally that will
-     *    be all internal methods that start with the
-     *    name "test". This method should be overridden
-     *    if you want a different rule.
-     *    @return array        List of test names.
-     *    @access public
-     */
-    function getTests() {
-        $methods = array();
-        foreach (get_class_methods(get_class($this)) as $method) {
-            if ($this->_isTest($method)) {
-                $methods[] = $method;
-            }
-        }
-        return $methods;
-    }
-
-    /**
-     *    Tests to see if the method is a test that should
-     *    be run. Currently any method that starts with 'test'
-     *    is a candidate unless it is the constructor.
-     *    @param string $method        Method name to try.
-     *    @return boolean              True if test method.
-     *    @access protected
-     */
-    function _isTest($method) {
-        if (strtolower(substr($method, 0, 4)) == 'test') {
-            return ! SimpleTestCompatibility::isA($this, strtolower($method));
-        }
-        return false;
-    }
-
-    /**
-     *    Announces the start of the test.
-     *    @param string $method    Test method just started.
-     *    @access public
-     */
-    function before($method) {
-        $this->_reporter->paintMethodStart($method);
-        $this->_observers = array();
-    }
-
-    /**
-     *    Sets up unit test wide variables at the start
-     *    of each test method. To be overridden in
-     *    actual user test cases.
-     *    @access public
-     */
-    function setUp() {
-    }
-
-    /**
-     *    Clears the data set in the setUp() method call.
-     *    To be overridden by the user in actual user test cases.
-     *    @access public
-     */
-    function tearDown() {
-    }
-
-    /**
-     *    Announces the end of the test. Includes private clean up.
-     *    @param string $method    Test method just finished.
-     *    @access public
-     */
-    function after($method) {
-        for ($i = 0; $i < count($this->_observers); $i++) {
-            $this->_observers[$i]->atTestEnd($method, $this);
-        }
-        $this->_reporter->paintMethodEnd($method);
-    }
-
-    /**
-     *    Sets up an observer for the test end.
-     *    @param object $observer    Must have atTestEnd()
-     *                               method.
-     *    @access public
-     */
-    function tell(&$observer) {
-        $this->_observers[] = &$observer;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function pass($message = "Pass") {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintPass(
-                $message . $this->getAssertionLine());
-        return true;
-    }
-
-    /**
-     *    Sends a fail event with a message.
-     *    @param string $message        Message to send.
-     *    @access public
-     */
-    function fail($message = "Fail") {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintFail(
-                $message . $this->getAssertionLine());
-        return false;
-    }
-
-    /**
-     *    Formats a PHP error and dispatches it to the
-     *    reporter.
-     *    @param integer $severity  PHP error code.
-     *    @param string $message    Text of error.
-     *    @param string $file       File error occoured in.
-     *    @param integer $line      Line number of error.
-     *    @access public
-     */
-    function error($severity, $message, $file, $line) {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintError(
-                "Unexpected PHP error [$message] severity [$severity] in [$file line $line]");
-    }
-
-    /**
-     *    Formats an exception and dispatches it to the
-     *    reporter.
-     *    @param Exception $exception    Object thrown.
-     *    @access public
-     */
-    function exception($exception) {
-        $this->_reporter->paintException($exception);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function signal($type, &$payload) {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintSignal($type, $payload);
-    }
-
-    /**
-     *    Runs an expectation directly, for extending the
-     *    tests with new expectation classes.
-     *    @param SimpleExpectation $expectation  Expectation subclass.
-     *    @param mixed $compare               Value to compare.
-     *    @param string $message                 Message to display.
-     *    @return boolean                        True on pass
-     *    @access public
-     */
-    function assert(&$expectation, $compare, $message = '%s') {
-        if ($expectation->test($compare)) {
-            return $this->pass(sprintf(
-                    $message,
-                    $expectation->overlayMessage($compare, $this->_reporter->getDumper())));
-        } else {
-            return $this->fail(sprintf(
-                    $message,
-                    $expectation->overlayMessage($compare, $this->_reporter->getDumper())));
-        }
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertExpectation(&$expectation, $compare, $message = '%s') {
-        return $this->assert($expectation, $compare, $message);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @return string           Line number of first assert*
-     *                             method embedded in format string.
-     *    @access public
-     */
-    function getAssertionLine() {
-        $trace = new SimpleStackTrace(array('assert', 'expect', 'pass', 'fail', 'skip'));
-        return $trace->traceMethod();
-    }
-
-    /**
-     *    Sends a formatted dump of a variable to the
-     *    test suite for those emergency debugging
-     *    situations.
-     *    @param mixed $variable    Variable to display.
-     *    @param string $message    Message to display.
-     *    @return mixed             The original variable.
-     *    @access public
-     */
-    function dump($variable, $message = false) {
-        $dumper = $this->_reporter->getDumper();
-        $formatted = $dumper->dump($variable);
-        if ($message) {
-            $formatted = $message . "\n" . $formatted;
-        }
-        $this->_reporter->paintFormattedMessage($formatted);
-        return $variable;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function sendMessage($message) {
-        $this->_reporter->PaintMessage($message);
-    }
-
-    /**
-     *    Accessor for the number of subtests including myelf.
-     *    @return integer           Number of test cases.
-     *    @access public
-     *    @static
-     */
-    function getSize() {
-        return 1;
-    }
-}
-
-/**
- *  Helps to extract test cases automatically from a file.
- */
-class SimpleFileLoader {
-
-    /**
-     *    Builds a test suite from a library of test cases.
-     *    The new suite is composed into this one.
-     *    @param string $test_file        File name of library with
-     *                                    test case classes.
-     *    @return TestSuite               The new test suite.
-     *    @access public
-     */
-    function &load($test_file) {
-        $existing_classes = get_declared_classes();
-        $existing_globals = get_defined_vars();
-        include_once($test_file);
-        $new_globals = get_defined_vars();
-        $this->_makeFileVariablesGlobal($existing_globals, $new_globals);
-        $new_classes = array_diff(get_declared_classes(), $existing_classes);
-        if (empty($new_classes)) {
-            $new_classes = $this->_scrapeClassesFromFile($test_file);
-        }
-        $classes = $this->selectRunnableTests($new_classes);
-        $suite = &$this->createSuiteFromClasses($test_file, $classes);
-        return $suite;
-    }
-
-    /**
-     *    Imports new variables into the global namespace.
-     *    @param hash $existing   Variables before the file was loaded.
-     *    @param hash $new        Variables after the file was loaded.
-     *    @access private
-     */
-    function _makeFileVariablesGlobal($existing, $new) {
-        $globals = array_diff(array_keys($new), array_keys($existing));
-        foreach ($globals as $global) {
-            $_GLOBALS[$global] = $new[$global];
-        }
-    }
-
-    /**
-     *    Lookup classnames from file contents, in case the
-     *    file may have been included before.
-     *    Note: This is probably too clever by half. Figuring this
-     *    out after a failed test case is going to be tricky for us,
-     *    never mind the user. A test case should not be included
-     *    twice anyway.
-     *    @param string $test_file        File name with classes.
-     *    @access private
-     */
-    function _scrapeClassesFromFile($test_file) {
-        preg_match_all('~^\s*class\s+(\w+)(\s+(extends|implements)\s+\w+)*\s*\{~mi',
-                        file_get_contents($test_file),
-                        $matches );
-        return $matches[1];
-    }
-
-    /**
-     *    Calculates the incoming test cases. Skips abstract
-     *    and ignored classes.
-     *    @param array $candidates   Candidate classes.
-     *    @return array              New classes which are test
-     *                               cases that shouldn't be ignored.
-     *    @access public
-     */
-    function selectRunnableTests($candidates) {
-        $classes = array();
-        foreach ($candidates as $class) {
-            if (TestSuite::getBaseTestCase($class)) {
-                $reflection = new SimpleReflection($class);
-                if ($reflection->isAbstract()) {
-                    SimpleTest::ignore($class);
-                } else {
-                    $classes[] = $class;
-                }
-            }
-        }
-        return $classes;
-    }
-
-    /**
-     *    Builds a test suite from a class list.
-     *    @param string $title       Title of new group.
-     *    @param array $classes      Test classes.
-     *    @return TestSuite          Group loaded with the new
-     *                               test cases.
-     *    @access public
-     */
-    function &createSuiteFromClasses($title, $classes) {
-        if (count($classes) == 0) {
-            $suite = &new BadTestSuite($title, "No runnable test cases in [$title]");
-            return $suite;
-        }
-        SimpleTest::ignoreParentsIfIgnored($classes);
-        $suite = &new TestSuite($title);
-        foreach ($classes as $class) {
-            if (! SimpleTest::isIgnored($class)) {
-                $suite->addTestClass($class);
-            }
-        }
-        return $suite;
-    }
-}
-
-/**
- *    This is a composite test class for combining
- *    test cases and other RunnableTest classes into
- *    a group test.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class TestSuite {
-    var $_label;
-    var $_test_cases;
-
-    /**
-     *    Sets the name of the test suite.
-     *    @param string $label    Name sent at the start and end
-     *                            of the test.
-     *    @access public
-     */
-    function TestSuite($label = false) {
-        $this->_label = $label;
-        $this->_test_cases = array();
-    }
-
-    /**
-     *    Accessor for the test name for subclasses. If the suite
-     *    wraps a single test case the label defaults to the name of that test.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        if (! $this->_label) {
-            return ($this->getSize() == 1) ?
-                    get_class($this->_test_cases[0]) : get_class($this);
-        } else {
-            return $this->_label;
-        }
-    }
-
-    /**
-     *    @deprecated
-     */
-    function addTestCase(&$test_case) {
-        $this->_test_cases[] = &$test_case;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function addTestClass($class) {
-        if (TestSuite::getBaseTestCase($class) == 'testsuite') {
-            $this->_test_cases[] = &new $class();
-        } else {
-            $this->_test_cases[] = $class;
-        }
-    }
-
-    /**
-     *    Adds a test into the suite by instance or class. The class will
-     *    be instantiated if it's a test suite.
-     *    @param SimpleTestCase $test_case  Suite or individual test
-     *                                      case implementing the
-     *                                      runnable test interface.
-     *    @access public
-     */
-    function add(&$test_case) {
-        $class = null;
-        if (! is_string($test_case)) {
-            $this->_test_cases[] = &$test_case;
-        } elseif (TestSuite::getBaseTestCase($class) == 'testsuite') {
-            $this->_test_cases[] = &new $class();
-        } else {
-            $this->_test_cases[] = $class;
-        }
-    }
-
-    /**
-     *    @deprecated
-     */
-    function addTestFile($test_file) {
-        $this->addFile($test_file);
-    }
-
-    /**
-     *    Builds a test suite from a library of test cases.
-     *    The new suite is composed into this one.
-     *    @param string $test_file        File name of library with
-     *                                    test case classes.
-     *    @access public
-     */
-    function addFile($test_file) {
-        $extractor = new SimpleFileLoader();
-        $this->add($extractor->load($test_file));
-    }
-
-    /**
-     *    Delegates to a visiting collector to add test
-     *    files.
-     *    @param string $path                  Path to scan from.
-     *    @param SimpleCollector $collector    Directory scanner.
-     *    @access public
-     */
-    function collect($path, &$collector) {
-        $collector->collect($this, $path);
-    }
-
-    /**
-     *    Invokes run() on all of the held test cases, instantiating
-     *    them if necessary.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-        for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
-            if (is_string($this->_test_cases[$i])) {
-                $class = $this->_test_cases[$i];
-                $test = &new $class();
-                $test->run($reporter);
-                unset($test);
-            } else {
-                $this->_test_cases[$i]->run($reporter);
-            }
-        }
-        $reporter->paintGroupEnd($this->getLabel());
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Number of contained test cases.
-     *    @return integer     Total count of cases in the group.
-     *    @access public
-     */
-    function getSize() {
-        $count = 0;
-        foreach ($this->_test_cases as $case) {
-            if (is_string($case)) {
-                if (! SimpleTest::isIgnored($case)) {
-                    $count++;
-                }
-            } else {
-                $count += $case->getSize();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     *    Test to see if a class is derived from the
-     *    SimpleTestCase class.
-     *    @param string $class     Class name.
-     *    @access public
-     *    @static
-     */
-    function getBaseTestCase($class) {
-        while ($class = get_parent_class($class)) {
-            $class = strtolower($class);
-            if ($class == 'simpletestcase' || $class == 'testsuite') {
-                return $class;
-            }
-        }
-        return false;
-    }
-}
-
-/**
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- *    @deprecated
- */
-class GroupTest extends TestSuite { }
-
-/**
- *    This is a failing group test for when a test suite hasn't
- *    loaded properly.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class BadTestSuite {
-    var $_label;
-    var $_error;
-
-    /**
-     *    Sets the name of the test suite and error message.
-     *    @param string $label    Name sent at the start and end
-     *                            of the test.
-     *    @access public
-     */
-    function BadTestSuite($label, $error) {
-        $this->_label = $label;
-        $this->_error = $error;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_label;
-    }
-
-    /**
-     *    Sends a single error to the reporter.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-        $reporter->paintFail('Bad TestSuite [' . $this->getLabel() .
-                '] with error [' . $this->_error . ']');
-        $reporter->paintGroupEnd($this->getLabel());
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Number of contained test cases. Always zero.
-     *    @return integer     Total count of cases in the group.
-     *    @access public
-     */
-    function getSize() {
-        return 0;
-    }
-}
-
-/**
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- *    @deprecated
- */
-class BadGroupTest extends BadTestSuite { }
-?>
diff --git a/tests/simpletest/unit_tester.php b/tests/simpletest/unit_tester.php
deleted file mode 100755
index 7cbdd7bc80..0000000000
--- a/tests/simpletest/unit_tester.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: unit_tester.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-/**#@-*/
-
-/**
- *    Standard unit test class for day to day testing
- *    of PHP code XP style. Adds some useful standard
- *    assertions.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class UnitTestCase extends SimpleTestCase {
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function UnitTestCase($label = false) {
-        if (! $label) {
-            $label = get_class($this);
-        }
-        $this->SimpleTestCase($label);
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true if the value is null.
-     *    @param null $value       Supposedly null value.
-     *    @param string $message   Message to display.
-     *    @return boolean                        True on pass
-     *    @access public
-     */
-    function assertNull($value, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($value) . '] should be null');
-        return $this->assertTrue(! isset($value), $message);
-    }
-
-    /**
-     *    Will be true if the value is set.
-     *    @param mixed $value           Supposedly set value.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass.
-     *    @access public
-     */
-    function assertNotNull($value, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($value) . '] should not be null');
-        return $this->assertTrue(isset($value), $message);
-    }
-
-    /**
-     *    Type and class test. Will pass if class
-     *    matches the type name or is a subclass or
-     *    if not an object, but the type is correct.
-     *    @param mixed $object         Object to test.
-     *    @param string $type          Type name as string.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass.
-     *    @access public
-     */
-    function assertIsA($object, $type, $message = '%s') {
-        return $this->assert(
-                new IsAExpectation($type),
-                $object,
-                $message);
-    }
-
-    /**
-     *    Type and class mismatch test. Will pass if class
-     *    name or underling type does not match the one
-     *    specified.
-     *    @param mixed $object         Object to test.
-     *    @param string $type          Type name as string.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass.
-     *    @access public
-     */
-    function assertNotA($object, $type, $message = '%s') {
-        return $this->assert(
-                new NotAExpectation($type),
-                $object,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the if the first parameter
-     *    is near enough to the second by the margin.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param mixed $margin         Fuzziness of match.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertWithinMargin($first, $second, $margin, $message = '%s') {
-        return $this->assert(
-                new WithinMarginExpectation($first, $margin),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters differ
-     *    by more than the margin.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param mixed $margin         Fuzziness of match.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertOutsideMargin($first, $second, $margin, $message = '%s') {
-        return $this->assert(
-                new OutsideMarginExpectation($first, $margin),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value and same type. Otherwise a fail.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertIdentical($first, $second, $message = '%s') {
-        return $this->assert(
-                new IdenticalExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the different value or different type.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotIdentical($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotIdenticalExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to the same object. Fail otherwise.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertReference(&$first, &$second, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should reference the same object');
-        return $this->assertTrue(
-                SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to different objects. Fail otherwise. The objects
-     *    have to be identical though.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully not the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertClone(&$first, &$second, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should not be the same object');
-        $identical = &new IdenticalExpectation($first);
-        return $this->assertTrue(
-                $identical->test($second) &&
-                        ! SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertCopy(&$first, &$second, $message = "%s") {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                "[" . $dumper->describeValue($first) .
-                        "] and [" . $dumper->describeValue($second) .
-                        "] should not be the same object");
-        return $this->assertFalse(
-                SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the Perl regex pattern
-     *    is found in the subject. Fail otherwise.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $subject    String to search in.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertPattern($pattern, $subject, $message = '%s') {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $subject,
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertWantedPattern($pattern, $subject, $message = '%s') {
-        return $this->assertPattern($pattern, $subject, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the perl regex pattern
-     *    is not present in subject. Fail if found.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $subject    String to search in.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertNoPattern($pattern, $subject, $message = '%s') {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $subject,
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedPattern($pattern, $subject, $message = '%s') {
-        return $this->assertNoPattern($pattern, $subject, $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function swallowErrors() {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->clear();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoErrors($message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        return $queue->assertNoErrors($message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertError($expected = false, $message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        return $queue->assertError($this->_coerceExpectation($expected), $message);
-    }
-
-    /**
-     *    Prepares for an error. If the error mismatches it
-     *    passes through, otherwise it is swallowed. Any
-     *    left over errors trigger failures.
-     *    @param SimpleExpectation/string $expected   The error to match.
-     *    @param string $message                      Message on failure.
-     *    @access public
-     */
-    function expectError($expected = false, $message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->expectError($this->_coerceExpectation($expected), $message);
-    }
-
-    /**
-     *    Prepares for an exception. If the error mismatches it
-     *    passes through, otherwise it is swallowed. Any
-     *    left over errors trigger failures.
-     *    @param SimpleExpectation/Exception $expected  The error to match.
-     *    @param string $message                        Message on failure.
-     *    @access public
-     */
-    function expectException($expected = false, $message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleExceptionTrap');
-        // :HACK: Directly substituting in seems to cause a segfault with
-        // Zend Optimizer on some systems
-        $line = $this->getAssertionLine();
-        $queue->expectException($expected, $message . $line);
-    }
-
-    /**
-     *    Creates an equality expectation if the
-     *    object/value is not already some type
-     *    of expectation.
-     *    @param mixed $expected      Expected value.
-     *    @return SimpleExpectation   Expectation object.
-     *    @access private
-     */
-    function _coerceExpectation($expected) {
-        if (!$expected) {
-            return new TrueExpectation();
-        }
-        if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
-            return $expected;
-        }
-        return new EqualExpectation(
-                is_string($expected) ? str_replace('%', '%%', $expected) : $expected);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertErrorPattern($pattern, $message = '%s') {
-        return $this->assertError(new PatternExpectation($pattern), $message);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/url.php b/tests/simpletest/url.php
deleted file mode 100755
index d1c7d6a107..0000000000
--- a/tests/simpletest/url.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: url.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    URL parser to replace parse_url() PHP function which
- *    got broken in PHP 4.3.0. Adds some browser specific
- *    functionality such as expandomatics.
- *    Guesses a bit trying to separate the host from
- *    the path and tries to keep a raw, possibly unparsable,
- *    request string as long as possible.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUrl {
-    var $_scheme;
-    var $_username;
-    var $_password;
-    var $_host;
-    var $_port;
-    var $_path;
-    var $_request;
-    var $_fragment;
-    var $_x;
-    var $_y;
-    var $_target;
-    var $_raw = false;
-
-    /**
-     *    Constructor. Parses URL into sections.
-     *    @param string $url        Incoming URL.
-     *    @access public
-     */
-    function SimpleUrl($url = '') {
-        list($x, $y) = $this->_chompCoordinates($url);
-        $this->setCoordinates($x, $y);
-        $this->_scheme = $this->_chompScheme($url);
-        list($this->_username, $this->_password) = $this->_chompLogin($url);
-        $this->_host = $this->_chompHost($url);
-        $this->_port = false;
-        if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
-            $this->_host = $host_parts[1];
-            $this->_port = (integer)$host_parts[2];
-        }
-        $this->_path = $this->_chompPath($url);
-        $this->_request = $this->_parseRequest($this->_chompRequest($url));
-        $this->_fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
-        $this->_target = false;
-    }
-
-    /**
-     *    Extracts the X, Y coordinate pair from an image map.
-     *    @param string $url   URL so far. The coordinates will be
-     *                         removed.
-     *    @return array        X, Y as a pair of integers.
-     *    @access private
-     */
-    function _chompCoordinates(&$url) {
-        if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
-            $url = $matches[1];
-            return array((integer)$matches[2], (integer)$matches[3]);
-        }
-        return array(false, false);
-    }
-
-    /**
-     *    Extracts the scheme part of an incoming URL.
-     *    @param string $url   URL so far. The scheme will be
-     *                         removed.
-     *    @return string       Scheme part or false.
-     *    @access private
-     */
-    function _chompScheme(&$url) {
-        if (preg_match('/^([^\/:]*):(\/\/)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return $matches[1];
-        }
-        return false;
-    }
-
-    /**
-     *    Extracts the username and password from the
-     *    incoming URL. The // prefix will be reattached
-     *    to the URL after the doublet is extracted.
-     *    @param string $url    URL so far. The username and
-     *                          password are removed.
-     *    @return array         Two item list of username and
-     *                          password. Will urldecode() them.
-     *    @access private
-     */
-    function _chompLogin(&$url) {
-        $prefix = '';
-        if (preg_match('/^(\/\/)(.*)/', $url, $matches)) {
-            $prefix = $matches[1];
-            $url = $matches[2];
-        }
-        if (preg_match('/^([^\/]*)@(.*)/', $url, $matches)) {
-            $url = $prefix . $matches[2];
-            $parts = split(":", $matches[1]);
-            return array(
-                    urldecode($parts[0]),
-                    isset($parts[1]) ? urldecode($parts[1]) : false);
-        }
-        $url = $prefix . $url;
-        return array(false, false);
-    }
-
-    /**
-     *    Extracts the host part of an incoming URL.
-     *    Includes the port number part. Will extract
-     *    the host if it starts with // or it has
-     *    a top level domain or it has at least two
-     *    dots.
-     *    @param string $url    URL so far. The host will be
-     *                          removed.
-     *    @return string        Host part guess or false.
-     *    @access private
-     */
-    function _chompHost(&$url) {
-        if (preg_match('/^(\/\/)(.*?)(\/.*|\?.*|#.*|$)/', $url, $matches)) {
-            $url = $matches[3];
-            return $matches[2];
-        }
-        if (preg_match('/(.*?)(\.\.\/|\.\/|\/|\?|#|$)(.*)/', $url, $matches)) {
-            $tlds = SimpleUrl::getAllTopLevelDomains();
-            if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Extracts the path information from the incoming
-     *    URL. Strips this path from the URL.
-     *    @param string $url     URL so far. The host will be
-     *                           removed.
-     *    @return string         Path part or '/'.
-     *    @access private
-     */
-    function _chompPath(&$url) {
-        if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return ($matches[1] ? $matches[1] : '');
-        }
-        return '';
-    }
-
-    /**
-     *    Strips off the request data.
-     *    @param string $url  URL so far. The request will be
-     *                        removed.
-     *    @return string      Raw request part.
-     *    @access private
-     */
-    function _chompRequest(&$url) {
-        if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return $matches[1];
-        }
-        return '';
-    }
-
-    /**
-     *    Breaks the request down into an object.
-     *    @param string $raw           Raw request.
-     *    @return SimpleFormEncoding    Parsed data.
-     *    @access private
-     */
-    function _parseRequest($raw) {
-        $this->_raw = $raw;
-        $request = new SimpleGetEncoding();
-        foreach (split("&", $raw) as $pair) {
-            if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
-                $request->add($matches[1], urldecode($matches[2]));
-            } elseif ($pair) {
-                $request->add($pair, '');
-            }
-        }
-        return $request;
-    }
-
-    /**
-     *    Accessor for protocol part.
-     *    @param string $default    Value to use if not present.
-     *    @return string            Scheme name, e.g "http".
-     *    @access public
-     */
-    function getScheme($default = false) {
-        return $this->_scheme ? $this->_scheme : $default;
-    }
-
-    /**
-     *    Accessor for user name.
-     *    @return string    Username preceding host.
-     *    @access public
-     */
-    function getUsername() {
-        return $this->_username;
-    }
-
-    /**
-     *    Accessor for password.
-     *    @return string    Password preceding host.
-     *    @access public
-     */
-    function getPassword() {
-        return $this->_password;
-    }
-
-    /**
-     *    Accessor for hostname and port.
-     *    @param string $default    Value to use if not present.
-     *    @return string            Hostname only.
-     *    @access public
-     */
-    function getHost($default = false) {
-        return $this->_host ? $this->_host : $default;
-    }
-
-    /**
-     *    Accessor for top level domain.
-     *    @return string       Last part of host.
-     *    @access public
-     */
-    function getTld() {
-        $path_parts = pathinfo($this->getHost());
-        return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
-    }
-
-    /**
-     *    Accessor for port number.
-     *    @return integer    TCP/IP port number.
-     *    @access public
-     */
-    function getPort() {
-        return $this->_port;
-    }
-
-    /**
-     *    Accessor for path.
-     *    @return string    Full path including leading slash if implied.
-     *    @access public
-     */
-    function getPath() {
-        if (! $this->_path && $this->_host) {
-            return '/';
-        }
-        return $this->_path;
-    }
-
-    /**
-     *    Accessor for page if any. This may be a
-     *    directory name if ambiguious.
-     *    @return            Page name.
-     *    @access public
-     */
-    function getPage() {
-        if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
-            return false;
-        }
-        return $matches[1];
-    }
-
-    /**
-     *    Gets the path to the page.
-     *    @return string       Path less the page.
-     *    @access public
-     */
-    function getBasePath() {
-        if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
-            return false;
-        }
-        return $matches[1];
-    }
-
-    /**
-     *    Accessor for fragment at end of URL after the "#".
-     *    @return string    Part after "#".
-     *    @access public
-     */
-    function getFragment() {
-        return $this->_fragment;
-    }
-
-    /**
-     *    Sets image coordinates. Set to false to clear
-     *    them.
-     *    @param integer $x    Horizontal position.
-     *    @param integer $y    Vertical position.
-     *    @access public
-     */
-    function setCoordinates($x = false, $y = false) {
-        if (($x === false) || ($y === false)) {
-            $this->_x = $this->_y = false;
-            return;
-        }
-        $this->_x = (integer)$x;
-        $this->_y = (integer)$y;
-    }
-
-    /**
-     *    Accessor for horizontal image coordinate.
-     *    @return integer        X value.
-     *    @access public
-     */
-    function getX() {
-        return $this->_x;
-    }
-
-    /**
-     *    Accessor for vertical image coordinate.
-     *    @return integer        Y value.
-     *    @access public
-     */
-    function getY() {
-        return $this->_y;
-    }
-
-    /**
-     *    Accessor for current request parameters
-     *    in URL string form. Will return teh original request
-     *    if at all possible even if it doesn't make much
-     *    sense.
-     *    @return string   Form is string "?a=1&b=2", etc.
-     *    @access public
-     */
-    function getEncodedRequest() {
-        if ($this->_raw) {
-            $encoded = $this->_raw;
-        } else {
-            $encoded = $this->_request->asUrlRequest();
-        }
-        if ($encoded) {
-            return '?' . preg_replace('/^\?/', '', $encoded);
-        }
-        return '';
-    }
-
-    /**
-     *    Adds an additional parameter to the request.
-     *    @param string $key            Name of parameter.
-     *    @param string $value          Value as string.
-     *    @access public
-     */
-    function addRequestParameter($key, $value) {
-        $this->_raw = false;
-        $this->_request->add($key, $value);
-    }
-
-    /**
-     *    Adds additional parameters to the request.
-     *    @param hash/SimpleFormEncoding $parameters   Additional
-     *                                                parameters.
-     *    @access public
-     */
-    function addRequestParameters($parameters) {
-        $this->_raw = false;
-        $this->_request->merge($parameters);
-    }
-
-    /**
-     *    Clears down all parameters.
-     *    @access public
-     */
-    function clearRequest() {
-        $this->_raw = false;
-        $this->_request = &new SimpleGetEncoding();
-    }
-
-    /**
-     *    Gets the frame target if present. Although
-     *    not strictly part of the URL specification it
-     *    acts as similarily to the browser.
-     *    @return boolean/string    Frame name or false if none.
-     *    @access public
-     */
-    function getTarget() {
-        return $this->_target;
-    }
-
-    /**
-     *    Attaches a frame target.
-     *    @param string $frame        Name of frame.
-     *    @access public
-     */
-    function setTarget($frame) {
-        $this->_raw = false;
-        $this->_target = $frame;
-    }
-
-    /**
-     *    Renders the URL back into a string.
-     *    @return string        URL in canonical form.
-     *    @access public
-     */
-    function asString() {
-        $path = $this->_path;
-        $scheme = $identity = $host = $encoded = $fragment = '';
-        if ($this->_username && $this->_password) {
-            $identity = $this->_username . ':' . $this->_password . '@';
-        }
-        if ($this->getHost()) {
-            $scheme = $this->getScheme() ? $this->getScheme() : 'http';
-            $scheme .= "://";
-            $host = $this->getHost();
-        }
-        if (substr($this->_path, 0, 1) == '/') {
-            $path = $this->normalisePath($this->_path);
-        }
-        $encoded = $this->getEncodedRequest();
-        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-        return "$scheme$identity$host$path$encoded$fragment$coords";
-    }
-
-    /**
-     *    Replaces unknown sections to turn a relative
-     *    URL into an absolute one. The base URL can
-     *    be either a string or a SimpleUrl object.
-     *    @param string/SimpleUrl $base       Base URL.
-     *    @access public
-     */
-    function makeAbsolute($base) {
-        if (! is_object($base)) {
-            $base = new SimpleUrl($base);
-        }
-        if ($this->getHost()) {
-            $scheme = $this->getScheme();
-            $host = $this->getHost();
-            $port = $this->getPort() ? ':' . $this->getPort() : '';
-            $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
-            if (! $identity) {
-                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-            }
-        } else {
-            $scheme = $base->getScheme();
-            $host = $base->getHost();
-            $port = $base->getPort() ? ':' . $base->getPort() : '';
-            $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-        }
-        $path = $this->normalisePath($this->_extractAbsolutePath($base));
-        $encoded = $this->getEncodedRequest();
-        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-        return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
-    }
-
-    /**
-     *    Replaces unknown sections of the path with base parts
-     *    to return a complete absolute one.
-     *    @param string/SimpleUrl $base       Base URL.
-     *    @param string                       Absolute path.
-     *    @access private
-     */
-    function _extractAbsolutePath($base) {
-        if ($this->getHost()) {
-            return $this->_path;
-        }
-        if (! $this->_isRelativePath($this->_path)) {
-            return $this->_path;
-        }
-        if ($this->_path) {
-            return $base->getBasePath() . $this->_path;
-        }
-        return $base->getPath();
-    }
-
-    /**
-     *    Simple test to see if a path part is relative.
-     *    @param string $path        Path to test.
-     *    @return boolean            True if starts with a "/".
-     *    @access private
-     */
-    function _isRelativePath($path) {
-        return (substr($path, 0, 1) != '/');
-    }
-
-    /**
-     *    Extracts the username and password for use in rendering
-     *    a URL.
-     *    @return string/boolean    Form of username:password or false.
-     *    @access public
-     */
-    function getIdentity() {
-        if ($this->_username && $this->_password) {
-            return $this->_username . ':' . $this->_password;
-        }
-        return false;
-    }
-
-    /**
-     *    Replaces . and .. sections of the path.
-     *    @param string $path    Unoptimised path.
-     *    @return string         Path with dots removed if possible.
-     *    @access public
-     */
-    function normalisePath($path) {
-        $path = preg_replace('|/\./|', '/', $path);
-        return preg_replace('|/[^/]+/\.\./|', '/', $path);
-    }
-
-    /**
-     *    A pipe seperated list of all TLDs that result in two part
-     *    domain names.
-     *    @return string        Pipe separated list.
-     *    @access public
-     *    @static
-     */
-    function getAllTopLevelDomains() {
-        return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/user_agent.php b/tests/simpletest/user_agent.php
deleted file mode 100755
index c049d13353..0000000000
--- a/tests/simpletest/user_agent.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: user_agent.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/cookies.php');
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/authentication.php');
-/**#@-*/
-
-if (! defined('DEFAULT_MAX_REDIRECTS')) {
-    define('DEFAULT_MAX_REDIRECTS', 3);
-}
-if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
-    define('DEFAULT_CONNECTION_TIMEOUT', 15);
-}
-
-/**
- *    Fetches web pages whilst keeping track of
- *    cookies and authentication.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUserAgent {
-    var $_cookie_jar;
-    var $_cookies_enabled = true;
-    var $_authenticator;
-    var $_max_redirects = DEFAULT_MAX_REDIRECTS;
-    var $_proxy = false;
-    var $_proxy_username = false;
-    var $_proxy_password = false;
-    var $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
-    var $_additional_headers = array();
-
-    /**
-     *    Starts with no cookies, realms or proxies.
-     *    @access public
-     */
-    function SimpleUserAgent() {
-        $this->_cookie_jar = &new SimpleCookieJar();
-        $this->_authenticator = &new SimpleAuthenticator();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened. Authorisation
-     *    has to be obtained again as well.
-     *    @param string/integer $date   Time when session restarted.
-     *                                  If omitted then all persistent
-     *                                  cookies are kept.
-     *    @access public
-     */
-    function restart($date = false) {
-        $this->_cookie_jar->restartSession($date);
-        $this->_authenticator->restartSession();
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->_additional_headers[] = $header;
-    }
-
-    /**
-     *    Ages the cookies by the specified time.
-     *    @param integer $interval    Amount in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->_cookie_jar->agePrematurely($interval);
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name            Cookie key.
-     *    @param string $value           Value of cookie.
-     *    @param string $host            Host upon which the cookie is valid.
-     *    @param string $path            Cookie path if not host wide.
-     *    @param string $expiry          Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->_cookie_jar->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        return $this->_cookie_jar->getCookieValue($host, $path, $name);
-    }
-
-    /**
-     *    Reads the current cookies within the base URL.
-     *    @param string $name     Key of cookie to find.
-     *    @param SimpleUrl $base  Base URL to search from.
-     *    @return string/boolean  Null if there is no base URL, false
-     *                            if the cookie is not set.
-     *    @access public
-     */
-    function getBaseCookieValue($name, $base) {
-        if (! $base) {
-            return null;
-        }
-        return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
-    }
-
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->_cookies_enabled = false;
-    }
-
-    /**
-     *    Switches back on the cookie sending and recieving.
-     *    @access public
-     */
-    function useCookies() {
-        $this->_cookies_enabled = true;
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->_connection_timeout = $timeout;
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    a page will be loaded anyway.
-     *    @param integer $max        Most hops allowed.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        $this->_max_redirects = $max;
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username, $password) {
-        if (! $proxy) {
-            $this->_proxy = false;
-            return;
-        }
-        if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
-            $proxy = 'http://'. $proxy;
-        }
-        $this->_proxy = &new SimpleUrl($proxy);
-        $this->_proxy_username = $username;
-        $this->_proxy_password = $password;
-    }
-
-    /**
-     *    Test to see if the redirect limit is passed.
-     *    @param integer $redirects        Count so far.
-     *    @return boolean                  True if over.
-     *    @access private
-     */
-    function _isTooManyRedirects($redirects) {
-        return ($redirects > $this->_max_redirects);
-    }
-
-    /**
-     *    Sets the identity for the current realm.
-     *    @param string $host        Host to which realm applies.
-     *    @param string $realm       Full name of realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @access public
-     */
-    function setIdentity($host, $realm, $username, $password) {
-        $this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
-    }
-
-    /**
-     *    Fetches a URL as a response object. Will keep trying if redirected.
-     *    It will also collect authentication realm information.
-     *    @param string/SimpleUrl $url      Target to fetch.
-     *    @param SimpleEncoding $encoding   Additional parameters for request.
-     *    @return SimpleHttpResponse        Hopefully the target page.
-     *    @access public
-     */
-    function &fetchResponse($url, $encoding) {
-        if ($encoding->getMethod() != 'POST') {
-            $url->addRequestParameters($encoding);
-            $encoding->clear();
-        }
-        $response = &$this->_fetchWhileRedirected($url, $encoding);
-        if ($headers = $response->getHeaders()) {
-            if ($headers->isChallenge()) {
-                $this->_authenticator->addRealm(
-                        $url,
-                        $headers->getAuthentication(),
-                        $headers->getRealm());
-            }
-        }
-        return $response;
-    }
-
-    /**
-     *    Fetches the page until no longer redirected or
-     *    until the redirect limit runs out.
-     *    @param SimpleUrl $url                  Target to fetch.
-     *    @param SimpelFormEncoding $encoding    Additional parameters for request.
-     *    @return SimpleHttpResponse             Hopefully the target page.
-     *    @access private
-     */
-    function &_fetchWhileRedirected($url, $encoding) {
-        $redirects = 0;
-        do {
-            $response = &$this->_fetch($url, $encoding);
-            if ($response->isError()) {
-                return $response;
-            }
-            $headers = $response->getHeaders();
-            $location = new SimpleUrl($headers->getLocation());
-            $url = $location->makeAbsolute($url);
-            if ($this->_cookies_enabled) {
-                $headers->writeCookiesToJar($this->_cookie_jar, $url);
-            }
-            if (! $headers->isRedirect()) {
-                break;
-            }
-            $encoding = new SimpleGetEncoding();
-        } while (! $this->_isTooManyRedirects(++$redirects));
-        return $response;
-    }
-
-    /**
-     *    Actually make the web request.
-     *    @param SimpleUrl $url                   Target to fetch.
-     *    @param SimpleFormEncoding $encoding     Additional parameters for request.
-     *    @return SimpleHttpResponse              Headers and hopefully content.
-     *    @access protected
-     */
-    function &_fetch($url, $encoding) {
-        $request = &$this->_createRequest($url, $encoding);
-        $response = &$request->fetch($this->_connection_timeout);
-        return $response;
-    }
-
-    /**
-     *    Creates a full page request.
-     *    @param SimpleUrl $url                 Target to fetch as url object.
-     *    @param SimpleFormEncoding $encoding   POST/GET parameters.
-     *    @return SimpleHttpRequest             New request.
-     *    @access private
-     */
-    function &_createRequest($url, $encoding) {
-        $request = &$this->_createHttpRequest($url, $encoding);
-        $this->_addAdditionalHeaders($request);
-        if ($this->_cookies_enabled) {
-            $request->readCookiesFromJar($this->_cookie_jar, $url);
-        }
-        $this->_authenticator->addHeaders($request, $url);
-        return $request;
-    }
-
-    /**
-     *    Builds the appropriate HTTP request object.
-     *    @param SimpleUrl $url                  Target to fetch as url object.
-     *    @param SimpleFormEncoding $parameters  POST/GET parameters.
-     *    @return SimpleHttpRequest              New request object.
-     *    @access protected
-     */
-    function &_createHttpRequest($url, $encoding) {
-        $request = &new SimpleHttpRequest($this->_createRoute($url), $encoding);
-        return $request;
-    }
-
-    /**
-     *    Sets up either a direct route or via a proxy.
-     *    @param SimpleUrl $url   Target to fetch as url object.
-     *    @return SimpleRoute     Route to take to fetch URL.
-     *    @access protected
-     */
-    function &_createRoute($url) {
-        if ($this->_proxy) {
-            $route = &new SimpleProxyRoute(
-                    $url,
-                    $this->_proxy,
-                    $this->_proxy_username,
-                    $this->_proxy_password);
-        } else {
-            $route = &new SimpleRoute($url);
-        }
-        return $route;
-    }
-
-    /**
-     *    Adds additional manual headers.
-     *    @param SimpleHttpRequest $request    Outgoing request.
-     *    @access private
-     */
-    function _addAdditionalHeaders(&$request) {
-        foreach ($this->_additional_headers as $header) {
-            $request->addHeaderLine($header);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/web_tester.php b/tests/simpletest/web_tester.php
deleted file mode 100755
index 16d08fae93..0000000000
--- a/tests/simpletest/web_tester.php
+++ /dev/null
@@ -1,1541 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: web_tester.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-require_once(dirname(__FILE__) . '/browser.php');
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-/**#@-*/
-
-/**
- *    Test for an HTML widget value match.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class FieldExpectation extends SimpleExpectation {
-    var $_value;
-
-    /**
-     *    Sets the field value to compare against.
-     *    @param mixed $value     Test value to match. Can be an
-     *                            expectation for say pattern matching.
-     *    @param string $message  Optiona message override. Can use %s as
-     *                            a placeholder for the original message.
-     *    @access public
-     */
-    function FieldExpectation($value, $message = '%s') {
-        $this->SimpleExpectation($message);
-        if (is_array($value)) {
-            sort($value);
-        }
-        $this->_value = $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches
-     *    a string value or an array value in any order.
-     *    @param mixed $compare        Comparison value. False for
-     *                                 an unset field.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        if ($this->_value === false) {
-            return ($compare === false);
-        }
-        if ($this->_isSingle($this->_value)) {
-            return $this->_testSingle($compare);
-        }
-        if (is_array($this->_value)) {
-            return $this->_testMultiple($compare);
-        }
-        return false;
-    }
-
-    /**
-     *    Tests for valid field comparisons with a single option.
-     *    @param mixed $value       Value to type check.
-     *    @return boolean           True if integer, string or float.
-     *    @access private
-     */
-    function _isSingle($value) {
-        return is_string($value) || is_integer($value) || is_float($value);
-    }
-
-    /**
-     *    String comparison for simple field with a single option.
-     *    @param mixed $compare    String to test against.
-     *    @returns boolean         True if matching.
-     *    @access private
-     */
-    function _testSingle($compare) {
-        if (is_array($compare) && count($compare) == 1) {
-            $compare = $compare[0];
-        }
-        if (! $this->_isSingle($compare)) {
-            return false;
-        }
-        return ($this->_value == $compare);
-    }
-
-    /**
-     *    List comparison for multivalue field.
-     *    @param mixed $compare    List in any order to test against.
-     *    @returns boolean         True if matching.
-     *    @access private
-     */
-    function _testMultiple($compare) {
-        if (is_string($compare)) {
-            $compare = array($compare);
-        }
-        if (! is_array($compare)) {
-            return false;
-        }
-        sort($compare);
-        return ($this->_value === $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if (is_array($compare)) {
-            sort($compare);
-        }
-        if ($this->test($compare)) {
-            return "Field expectation [" . $dumper->describeValue($this->_value) . "]";
-        } else {
-            return "Field expectation [" . $dumper->describeValue($this->_value) .
-                    "] fails with [" .
-                    $dumper->describeValue($compare) . "] " .
-                    $dumper->describeDifference($this->_value, $compare);
-        }
-    }
-}
-
-/**
- *    Test for a specific HTTP header within a header block.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class HttpHeaderExpectation extends SimpleExpectation {
-    var $_expected_header;
-    var $_expected_value;
-
-    /**
-     *    Sets the field and value to compare against.
-     *    @param string $header   Case insenstive trimmed header name.
-     *    @param mixed $value     Optional value to compare. If not
-     *                            given then any value will match. If
-     *                            an expectation object then that will
-     *                            be used instead.
-     *    @param string $message  Optiona message override. Can use %s as
-     *                            a placeholder for the original message.
-     */
-    function HttpHeaderExpectation($header, $value = false, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_expected_header = $this->_normaliseHeader($header);
-        $this->_expected_value = $value;
-    }
-
-    /**
-     *    Accessor for aggregated object.
-     *    @return mixed        Expectation set in constructor.
-     *    @access protected
-     */
-    function _getExpectation() {
-        return $this->_expected_value;
-    }
-
-    /**
-     *    Removes whitespace at ends and case variations.
-     *    @param string $header    Name of header.
-     *    @param string            Trimmed and lowecased header
-     *                             name.
-     *    @access private
-     */
-    function _normaliseHeader($header) {
-        return strtolower(trim($header));
-    }
-
-    /**
-     *    Tests the expectation. True if it matches
-     *    a string value or an array value in any order.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return boolean         True if header present.
-     *    @access public
-     */
-    function test($compare) {
-        return is_string($this->_findHeader($compare));
-    }
-
-    /**
-     *    Searches the incoming result. Will extract the matching
-     *    line as text.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return string          Matching header line.
-     *    @access protected
-     */
-    function _findHeader($compare) {
-        $lines = split("\r\n", $compare);
-        foreach ($lines as $line) {
-            if ($this->_testHeaderLine($line)) {
-                return $line;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Compares a single header line against the expectation.
-     *    @param string $line      A single line to compare.
-     *    @return boolean          True if matched.
-     *    @access private
-     */
-    function _testHeaderLine($line) {
-        if (count($parsed = split(':', $line, 2)) < 2) {
-            return false;
-        }
-        list($header, $value) = $parsed;
-        if ($this->_normaliseHeader($header) != $this->_expected_header) {
-            return false;
-        }
-        return $this->_testHeaderValue($value, $this->_expected_value);
-    }
-
-    /**
-     *    Tests the value part of the header.
-     *    @param string $value        Value to test.
-     *    @param mixed $expected      Value to test against.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    function _testHeaderValue($value, $expected) {
-        if ($expected === false) {
-            return true;
-        }
-        if (SimpleExpectation::isExpectation($expected)) {
-            return $expected->test(trim($value));
-        }
-        return (trim($value) == trim($expected));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Raw header block to search.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if (SimpleExpectation::isExpectation($this->_expected_value)) {
-            $message = $this->_expected_value->overlayMessage($compare, $this->_getDumper());
-        } else {
-            $message = $this->_expected_header .
-                    ($this->_expected_value ? ': ' . $this->_expected_value : '');
-        }
-        if (is_string($line = $this->_findHeader($compare))) {
-            return "Searching for header [$message] found [$line]";
-        } else {
-            return "Failed to find header [$message]";
-        }
-    }
-}
-
-/**
- *    Test for a specific HTTP header within a header block that
- *    should not be found.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class NoHttpHeaderExpectation extends HttpHeaderExpectation {
-    var $_expected_header;
-    var $_expected_value;
-
-    /**
-     *    Sets the field and value to compare against.
-     *    @param string $unwanted   Case insenstive trimmed header name.
-     *    @param string $message    Optiona message override. Can use %s as
-     *                              a placeholder for the original message.
-     */
-    function NoHttpHeaderExpectation($unwanted, $message = '%s') {
-        $this->HttpHeaderExpectation($unwanted, false, $message);
-    }
-
-    /**
-     *    Tests that the unwanted header is not found.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return boolean         True if header present.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_findHeader($compare) === false);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Raw header block to search.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $expectation = $this->_getExpectation();
-        if (is_string($line = $this->_findHeader($compare))) {
-            return "Found unwanted header [$expectation] with [$line]";
-        } else {
-            return "Did not find unwanted header [$expectation]";
-        }
-    }
-}
-
-/**
- *    Test for a text substring.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class TextExpectation extends SimpleExpectation {
-    var $_substring;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $substring  Text to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function TextExpectation($substring, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_substring = $substring;
-    }
-
-    /**
-     *    Accessor for the substring.
-     *    @return string       Text to match.
-     *    @access protected
-     */
-    function _getSubstring() {
-        return $this->_substring;
-    }
-
-    /**
-     *    Tests the expectation. True if the text contains the
-     *    substring.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (strpos($compare, $this->_substring) !== false);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->_describeTextMatch($this->_getSubstring(), $compare);
-        } else {
-            $dumper = &$this->_getDumper();
-            return "Text [" . $this->_getSubstring() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        }
-    }
-
-    /**
-     *    Describes a pattern match including the string
-     *    found and it's position.
-     *    @param string $substring      Text to search for.
-     *    @param string $subject        Subject to search.
-     *    @access protected
-     */
-    function _describeTextMatch($substring, $subject) {
-        $position = strpos($subject, $substring);
-        $dumper = &$this->_getDumper();
-        return "Text [$substring] detected at character [$position] in [" .
-                $dumper->describeValue($subject) . "] in region [" .
-                $dumper->clipString($subject, 100, $position) . "]";
-    }
-}
-
-/**
- *    Fail if a substring is detected within the
- *    comparison text.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoTextExpectation extends TextExpectation {
-
-    /**
-     *    Sets the reject pattern
-     *    @param string $substring  Text to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NoTextExpectation($substring, $message = '%s') {
-        $this->TextExpectation($substring, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the substring appears
-     *    in the text.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param string $compare      Comparison value.
-     *    @return string              Description of success
-     *                                or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            $dumper = &$this->_getDumper();
-            return "Text [" . $this->_getSubstring() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        } else {
-            return $this->_describeTextMatch($this->_getSubstring(), $compare);
-        }
-    }
-}
-
-/**
- *    Test case for testing of web pages. Allows
- *    fetching of pages, parsing of HTML and
- *    submitting forms.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class WebTestCase extends SimpleTestCase {
-    var $_browser;
-    var $_ignore_errors = false;
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function WebTestCase($label = false) {
-        $this->SimpleTestCase($label);
-    }
-
-    /**
-     *    Announces the start of the test.
-     *    @param string $method    Test method just started.
-     *    @access public
-     */
-    function before($method) {
-        parent::before($method);
-        $this->setBrowser($this->createBrowser());
-    }
-
-    /**
-     *    Announces the end of the test. Includes private clean up.
-     *    @param string $method    Test method just finished.
-     *    @access public
-     */
-    function after($method) {
-        $this->unsetBrowser();
-        parent::after($method);
-    }
-
-    /**
-     *    Gets a current browser reference for setting
-     *    special expectations or for detailed
-     *    examination of page fetches.
-     *    @return SimpleBrowser     Current test browser object.
-     *    @access public
-     */
-    function &getBrowser() {
-        return $this->_browser;
-    }
-
-    /**
-     *    Gets a current browser reference for setting
-     *    special expectations or for detailed
-     *    examination of page fetches.
-     *    @param SimpleBrowser $browser    New test browser object.
-     *    @access public
-     */
-    function setBrowser(&$browser) {
-        return $this->_browser = &$browser;
-    }
-
-    /**
-     *    Clears the current browser reference to help the
-     *    PHP garbage collector.
-     *    @access public
-     */
-    function unsetBrowser() {
-        unset($this->_browser);
-    }
-
-    /**
-     *    Creates a new default web browser object.
-     *    Will be cleared at the end of the test method.
-     *    @return TestBrowser           New browser.
-     *    @access public
-     */
-    function &createBrowser() {
-        $browser = &new SimpleBrowser();
-        return $browser;
-    }
-
-    /**
-     *    Gets the last response error.
-     *    @return string    Last low level HTTP error.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->_browser->getTransportError();
-    }
-
-    /**
-     *    Accessor for the currently selected URL.
-     *    @return string        Current location or false if
-     *                          no page yet fetched.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->_browser->getUrl();
-    }
-
-    /**
-     *    Dumps the current request for debugging.
-     *    @access public
-     */
-    function showRequest() {
-        $this->dump($this->_browser->getRequest());
-    }
-
-    /**
-     *    Dumps the current HTTP headers for debugging.
-     *    @access public
-     */
-    function showHeaders() {
-        $this->dump($this->_browser->getHeaders());
-    }
-
-    /**
-     *    Dumps the current HTML source for debugging.
-     *    @access public
-     */
-    function showSource() {
-        $this->dump($this->_browser->getContent());
-    }
-
-    /**
-     *    Dumps the visible text only for debugging.
-     *    @access public
-     */
-    function showText() {
-        $this->dump(wordwrap($this->_browser->getContentAsText(), 80));
-    }
-
-    /**
-     *    Simulates the closing and reopening of the browser.
-     *    Temporary cookies will be discarded and timed
-     *    cookies will be expired if later than the
-     *    specified time.
-     *    @param string/integer $date Time when session restarted.
-     *                                If ommitted then all persistent
-     *                                cookies are kept. Time is either
-     *                                Cookie format string or timestamp.
-     *    @access public
-     */
-    function restart($date = false) {
-        if ($date === false) {
-            $date = time();
-        }
-        $this->_browser->restart($date);
-    }
-
-    /**
-     *    Moves cookie expiry times back into the past.
-     *    Useful for testing timeouts and expiries.
-     *    @param integer $interval    Amount to age in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->_browser->ageCookies($interval);
-    }
-
-    /**
-     *    Disables frames support. Frames will not be fetched
-     *    and the frameset page will be used instead.
-     *    @access public
-     */
-    function ignoreFrames() {
-        $this->_browser->ignoreFrames();
-    }
-
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->_browser->ignoreCookies();
-    }
-
-    /**
-     *    Skips errors for the next request only. You might
-     *    want to confirm that a page is unreachable for
-     *    example.
-     *    @access public
-     */
-    function ignoreErrors() {
-        $this->_ignore_errors = true;
-    }
-
-    /**
-     *    Issues a fail if there is a transport error anywhere
-     *    in the current frameset. Only one such error is
-     *    reported.
-     *    @param string/boolean $result   HTML or failure.
-     *    @return string/boolean $result  Passes through result.
-     *    @access private
-     */
-    function _failOnError($result) {
-        if (! $this->_ignore_errors) {
-            if ($error = $this->_browser->getTransportError()) {
-                $this->fail($error);
-            }
-        }
-        $this->_ignore_errors = false;
-        return $result;
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->_browser->addHeader($header);
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    the web page is loaded regardless.
-     *    @param integer $max        Maximum hops.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        if (! $this->_browser) {
-            trigger_error(
-                    'Can only set maximum redirects in a test method, setUp() or tearDown()');
-        }
-        $this->_browser->setMaximumRedirects($max);
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection and
-     *    receiving at least one byte of information.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->_browser->setConnectionTimeout($timeout);
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $this->_browser->useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    Fetches a page into the page buffer. If
-     *    there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function get($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->get($url, $parameters));
-    }
-
-    /**
-     *    Fetches a page by POST into the page buffer.
-     *    If there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function post($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->post($url, $parameters));
-    }
-
-    /**
-     *    Does a HTTP HEAD fetch, fetching only the page
-     *    headers. The current base URL is unchanged by this.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean             True on success.
-     *    @access public
-     */
-    function head($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->head($url, $parameters));
-    }
-
-    /**
-     *    Equivalent to hitting the retry button on the
-     *    browser. Will attempt to repeat the page fetch.
-     *    @return boolean     True if fetch succeeded.
-     *    @access public
-     */
-    function retry() {
-        return $this->_failOnError($this->_browser->retry());
-    }
-
-    /**
-     *    Equivalent to hitting the back button on the
-     *    browser.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded.
-     *    @access public
-     */
-    function back() {
-        return $this->_failOnError($this->_browser->back());
-    }
-
-    /**
-     *    Equivalent to hitting the forward button on the
-     *    browser.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded.
-     *    @access public
-     */
-    function forward() {
-        return $this->_failOnError($this->_browser->forward());
-    }
-
-    /**
-     *    Retries a request after setting the authentication
-     *    for the current realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @return boolean/string     HTML on successful fetch. Note
-     *                               that authentication may still have
-     *                               failed.
-     *    @access public
-     */
-    function authenticate($username, $password) {
-        return $this->_failOnError(
-                $this->_browser->authenticate($username, $password));
-    }
-
-    /**
-     *    Gets the cookie value for the current browser context.
-     *    @param string $name          Name of cookie.
-     *    @return string               Value of cookie or false if unset.
-     *    @access public
-     */
-    function getCookie($name) {
-        return $this->_browser->getCurrentCookieValue($name);
-    }
-
-    /**
-     *    Sets a cookie in the current browser.
-     *    @param string $name          Name of cookie.
-     *    @param string $value         Cookie value.
-     *    @param string $host          Host upon which the cookie is valid.
-     *    @param string $path          Cookie path if not host wide.
-     *    @param string $expiry        Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->_browser->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus.
-     *    @return integer/string/boolean    Label if any, otherwise
-     *                                      the position in the frameset
-     *                                      or false if none.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return $this->_browser->getFrameFocus();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return $this->_browser->setFrameFocusByIndex($choice);
-    }
-
-    /**
-     *    Sets the focus by name.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return $this->_browser->setFrameFocus($name);
-    }
-
-    /**
-     *    Clears the frame focus. All frames will be searched
-     *    for content.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        return $this->_browser->clearFrameFocus();
-    }
-
-    /**
-     *    Clicks a visible text item. Will first try buttons,
-     *    then links and then images.
-     *    @param string $label        Visible text or alt text.
-     *    @return string/boolean      Raw page or false.
-     *    @access public
-     */
-    function click($label) {
-        return $this->_failOnError($this->_browser->click($label));
-    }
-
-    /**
-     *    Checks for a click target.
-     *    @param string $label        Visible text or alt text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */
-    function assertClickable($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->isClickable($label),
-                sprintf($message, "Click target [$label] should exist"));
-    }
-
-    /**
-     *    Clicks the submit button by label. The owning
-     *    form will be submitted by this.
-     *    @param string $label    Button label. An unlabeled
-     *                            button can be triggered by 'Submit'.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success, else false.
-     *    @access public
-     */
-    function clickSubmit($label = 'Submit', $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickSubmit($label, $additional));
-    }
-
-    /**
-     *    Clicks the submit button by name attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $name     Name attribute of button.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickSubmitByName($name, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickSubmitByName($name, $additional));
-    }
-
-    /**
-     *    Clicks the submit button by ID attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $id       ID attribute of button.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickSubmitById($id, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickSubmitById($id, $additional));
-    }
-
-    /**
-     *    Checks for a valid button label.
-     *    @param string $label        Visible text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */
-    function assertSubmit($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->isSubmit($label),
-                sprintf($message, "Submit button [$label] should exist"));
-    }
-
-    /**
-     *    Clicks the submit image by some kind of label. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $label    Alt attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickImage($label, $x = 1, $y = 1, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickImage($label, $x, $y, $additional));
-    }
-
-    /**
-     *    Clicks the submit image by the name. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $name     Name attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickImageByName($name, $x, $y, $additional));
-    }
-
-    /**
-     *    Clicks the submit image by ID attribute. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param integer/string $id   ID attribute of button.
-     *    @param integer $x           X-coordinate of imaginary click.
-     *    @param integer $y           Y-coordinate of imaginary click.
-     *    @param hash $additional     Additional form values.
-     *    @return boolean/string      Page on success.
-     *    @access public
-     */
-    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickImageById($id, $x, $y, $additional));
-    }
-
-    /**
-     *    Checks for a valid image with atht alt text or title.
-     *    @param string $label        Visible text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */
-    function assertImage($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->isImage($label),
-                sprintf($message, "Image with text [$label] should exist"));
-    }
-
-    /**
-     *    Submits a form by the ID.
-     *    @param string $id       Form ID. No button information
-     *                            is submitted this way.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function submitFormById($id) {
-        return $this->_failOnError($this->_browser->submitFormById($id));
-    }
-
-    /**
-     *    Follows a link by name. Will click the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. Match is case insensitive
-     *    with normalised space.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return boolean/string   Page on success.
-     *    @access public
-     */
-    function clickLink($label, $index = 0) {
-        return $this->_failOnError($this->_browser->clickLink($label, $index));
-    }
-
-    /**
-     *    Follows a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return boolean/string   Page on success.
-     *    @access public
-     */
-    function clickLinkById($id) {
-        return $this->_failOnError($this->_browser->clickLinkById($id));
-    }
-
-    /**
-     *    Tests for the presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string $label     Text between the anchor tags.
-     *    @param mixed $expected   Expected URL or expectation object.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link present.
-     *    @access public
-     */
-    function assertLink($label, $expected = true, $message = '%s') {
-        $url = $this->_browser->getLink($label);
-        if ($expected === true || ($expected !== true && $url === false)) {
-            return $this->assertTrue($url !== false, sprintf($message, "Link [$label] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new IdenticalExpectation($expected);
-        }
-        return $this->assert($expected, $url->asString(), sprintf($message, "Link [$label] should match"));
-    }
-
-    /**
-     *    Tests for the non-presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string/integer $label    Text between the anchor tags
-     *                                    or ID attribute.
-     *    @param string $message          Message to display. Default
-     *                                    can be embedded with %s.
-     *    @return boolean                 True if link missing.
-     *    @access public
-     */
-    function assertNoLink($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->getLink($label) === false,
-                sprintf($message, "Link [$label] should not exist"));
-    }
-
-    /**
-     *    Tests for the presence of a link id attribute.
-     *    @param string $id        Id attribute value.
-     *    @param mixed $expected   Expected URL or expectation object.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link present.
-     *    @access public
-     */
-    function assertLinkById($id, $expected = true, $message = '%s') {
-        $url = $this->_browser->getLinkById($id);
-        if ($expected === true) {
-            return $this->assertTrue($url !== false, sprintf($message, "Link ID [$id] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new IdenticalExpectation($expected);
-        }
-        return $this->assert($expected, $url->asString(), sprintf($message, "Link ID [$id] should match"));
-    }
-
-    /**
-     *    Tests for the non-presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string $id        Id attribute value.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link missing.
-     *    @access public
-     */
-    function assertNoLinkById($id, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->getLinkById($id) === false,
-                sprintf($message, "Link ID [$id] should not exist"));
-    }
-
-    /**
-     *    Sets all form fields with that label, or name if there
-     *    is no label attached.
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setField($label, $value, $position=false) {
-        return $this->_browser->setField($label, $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that name.
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldByName($name, $value, $position=false) {
-        return $this->_browser->setFieldByName($name, $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that id.
-     *    @param string/integer $id   Id of field in forms.
-     *    @param string $value        New value of field.
-     *    @return boolean             True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldById($id, $value) {
-        return $this->_browser->setFieldById($id, $value);
-    }
-
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form will always
-     *    fail. If no value is given then only the existence
-     *    of the field is checked.
-     *    @param string $name       Name of field in forms.
-     *    @param mixed $expected    Expected string/array value or
-     *                              false for unset fields.
-     *    @param string $message    Message to display. Default
-     *                              can be embedded with %s.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertField($label, $expected = true, $message = '%s') {
-        $value = $this->_browser->getField($label);
-        return $this->_assertFieldValue($label, $value, $expected, $message);
-    }
-
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form element will always
-     *    fail. If no value is given then only the existence
-     *    of the field is checked.
-     *    @param string $name       Name of field in forms.
-     *    @param mixed $expected    Expected string/array value or
-     *                              false for unset fields.
-     *    @param string $message    Message to display. Default
-     *                              can be embedded with %s.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertFieldByName($name, $expected = true, $message = '%s') {
-        $value = $this->_browser->getFieldByName($name);
-        return $this->_assertFieldValue($name, $value, $expected, $message);
-    }
-
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form will always
-     *    fail. If no ID is given then only the existence
-     *    of the field is checked.
-     *    @param string/integer $id  Name of field in forms.
-     *    @param mixed $expected     Expected string/array value or
-     *                               false for unset fields.
-     *    @param string $message     Message to display. Default
-     *                               can be embedded with %s.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertFieldById($id, $expected = true, $message = '%s') {
-        $value = $this->_browser->getFieldById($id);
-        return $this->_assertFieldValue($id, $value, $expected, $message);
-    }
-
-    /**
-     *    Tests the field value against the expectation.
-     *    @param string $identifier      Name, ID or label.
-     *    @param mixed $value            Current field value.
-     *    @param mixed $expected         Expected value to match.
-     *    @param string $message         Failure message.
-     *    @return boolean                True if pass
-     *    @access protected
-     */
-    function _assertFieldValue($identifier, $value, $expected, $message) {
-        if ($expected === true) {
-            return $this->assertTrue(
-                    isset($value),
-                    sprintf($message, "Field [$identifier] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $identifier = str_replace('%', '%%', $identifier);
-            $expected = new FieldExpectation(
-                    $expected,
-                    "Field [$identifier] should match with [%s]");
-        }
-        return $this->assert($expected, $value, $message);
-    }
-
-    /**
-     *    Checks the response code against a list
-     *    of possible values.
-     *    @param array $responses    Possible responses for a pass.
-     *    @param string $message     Message to display. Default
-     *                               can be embedded with %s.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertResponse($responses, $message = '%s') {
-        $responses = (is_array($responses) ? $responses : array($responses));
-        $code = $this->_browser->getResponseCode();
-        $message = sprintf($message, "Expecting response in [" .
-                implode(", ", $responses) . "] got [$code]");
-        return $this->assertTrue(in_array($code, $responses), $message);
-    }
-
-    /**
-     *    Checks the mime type against a list
-     *    of possible values.
-     *    @param array $types      Possible mime types for a pass.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertMime($types, $message = '%s') {
-        $types = (is_array($types) ? $types : array($types));
-        $type = $this->_browser->getMimeType();
-        $message = sprintf($message, "Expecting mime type in [" .
-                implode(", ", $types) . "] got [$type]");
-        return $this->assertTrue(in_array($type, $types), $message);
-    }
-
-    /**
-     *    Attempt to match the authentication type within
-     *    the security realm we are currently matching.
-     *    @param string $authentication   Usually basic.
-     *    @param string $message          Message to display.
-     *    @return boolean                 True if pass.
-     *    @access public
-     */
-    function assertAuthentication($authentication = false, $message = '%s') {
-        if (! $authentication) {
-            $message = sprintf($message, "Expected any authentication type, got [" .
-                    $this->_browser->getAuthentication() . "]");
-            return $this->assertTrue(
-                    $this->_browser->getAuthentication(),
-                    $message);
-        } else {
-            $message = sprintf($message, "Expected authentication [$authentication] got [" .
-                    $this->_browser->getAuthentication() . "]");
-            return $this->assertTrue(
-                    strtolower($this->_browser->getAuthentication()) == strtolower($authentication),
-                    $message);
-        }
-    }
-
-    /**
-     *    Checks that no authentication is necessary to view
-     *    the desired page.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertNoAuthentication($message = '%s') {
-        $message = sprintf($message, "Expected no authentication type, got [" .
-                $this->_browser->getAuthentication() . "]");
-        return $this->assertFalse($this->_browser->getAuthentication(), $message);
-    }
-
-    /**
-     *    Attempts to match the current security realm.
-     *    @param string $realm     Name of security realm.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertRealm($realm, $message = '%s') {
-        if (! SimpleExpectation::isExpectation($realm)) {
-            $realm = new EqualExpectation($realm);
-        }
-        return $this->assert(
-                $realm,
-                $this->_browser->getRealm(),
-                "Expected realm -> $message");
-    }
-
-    /**
-     *    Checks each header line for the required value. If no
-     *    value is given then only an existence check is made.
-     *    @param string $header    Case insensitive header name.
-     *    @param mixed $value      Case sensitive trimmed string to
-     *                             match against. An expectation object
-     *                             can be used for pattern matching.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertHeader($header, $value = false, $message = '%s') {
-        return $this->assert(
-                new HttpHeaderExpectation($header, $value),
-                $this->_browser->getHeaders(),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertHeaderPattern($header, $pattern, $message = '%s') {
-        return $this->assert(
-                new HttpHeaderExpectation($header, new PatternExpectation($pattern)),
-                $this->_browser->getHeaders(),
-                $message);
-    }
-
-    /**
-     *    Confirms that the header type has not been received.
-     *    Only the landing page is checked. If you want to check
-     *    redirect pages, then you should limit redirects so
-     *    as to capture the page you want.
-     *    @param string $header    Case insensitive header name.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertNoHeader($header, $message = '%s') {
-        return $this->assert(
-                new NoHttpHeaderExpectation($header),
-                $this->_browser->getHeaders(),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedHeader($header, $message = '%s') {
-        return $this->assertNoHeader($header, $message);
-    }
-
-    /**
-     *    Tests the text between the title tags.
-     *    @param string/SimpleExpectation $title    Expected title.
-     *    @param string $message                    Message to display.
-     *    @return boolean                           True if pass.
-     *    @access public
-     */
-    function assertTitle($title = false, $message = '%s') {
-        if (! SimpleExpectation::isExpectation($title)) {
-            $title = new EqualExpectation($title);
-        }
-        return $this->assert($title, $this->_browser->getTitle(), $message);
-    }
-
-    /**
-     *    Will trigger a pass if the text is found in the plain
-     *    text form of the page.
-     *    @param string $text       Text to look for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertText($text, $message = '%s') {
-        return $this->assert(
-                new TextExpectation($text),
-                $this->_browser->getContentAsText(),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertWantedText($text, $message = '%s') {
-        return $this->assertText($text, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the text is not found in the plain
-     *    text form of the page.
-     *    @param string $text       Text to look for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoText($text, $message = '%s') {
-        return $this->assert(
-                new NoTextExpectation($text),
-                $this->_browser->getContentAsText(),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedText($text, $message = '%s') {
-        return $this->assertNoText($text, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the Perl regex pattern
-     *    is found in the raw content.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertPattern($pattern, $message = '%s') {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $this->_browser->getContent(),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertWantedPattern($pattern, $message = '%s') {
-        return $this->assertPattern($pattern, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the perl regex pattern
-     *    is not present in raw content.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoPattern($pattern, $message = '%s') {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $this->_browser->getContent(),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedPattern($pattern, $message = '%s') {
-        return $this->assertNoPattern($pattern, $message);
-    }
-
-    /**
-     *    Checks that a cookie is set for the current page
-     *    and optionally checks the value.
-     *    @param string $name        Name of cookie to test.
-     *    @param string $expected    Expected value as a string or
-     *                               false if any value will do.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertCookie($name, $expected = false, $message = '%s') {
-        $value = $this->getCookie($name);
-        if (! $expected) {
-            return $this->assertTrue(
-                    $value,
-                    sprintf($message, "Expecting cookie [$name]"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new EqualExpectation($expected);
-        }
-        return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
-    }
-
-    /**
-     *    Checks that no cookie is present or that it has
-     *    been successfully cleared.
-     *    @param string $name        Name of cookie to test.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertNoCookie($name, $message = '%s') {
-        return $this->assertTrue(
-                $this->getCookie($name) === false,
-                sprintf($message, "Not expecting cookie [$name]"));
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @return string           Line number of first assert*
-     *                             method embedded in format string.
-     *    @access public
-     */
-    function getAssertionLine() {
-        $trace = new SimpleStackTrace(array('assert', 'click', 'pass', 'fail'));
-        return $trace->traceMethod();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/xml.php b/tests/simpletest/xml.php
deleted file mode 100755
index 1666cb9308..0000000000
--- a/tests/simpletest/xml.php
+++ /dev/null
@@ -1,647 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: xml.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-/**#@-*/
-
-/**
- *    Creates the XML needed for remote communication
- *    by SimpleTest.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class XmlReporter extends SimpleReporter {
-    var $_indent;
-    var $_namespace;
-
-    /**
-     *    Sets up indentation and namespace.
-     *    @param string $namespace        Namespace to add to each tag.
-     *    @param string $indent           Indenting to add on each nesting.
-     *    @access public
-     */
-    function XmlReporter($namespace = false, $indent = '  ') {
-        $this->SimpleReporter();
-        $this->_namespace = ($namespace ? $namespace . ':' : '');
-        $this->_indent = $indent;
-    }
-
-    /**
-     *    Calculates the pretty printing indent level
-     *    from the current level of nesting.
-     *    @param integer $offset  Extra indenting level.
-     *    @return string          Leading space.
-     *    @access protected
-     */
-    function _getIndent($offset = 0) {
-        return str_repeat(
-                $this->_indent,
-                count($this->getTestList()) + $offset);
-    }
-
-    /**
-     *    Converts character string to parsed XML
-     *    entities string.
-     *    @param string text        Unparsed character data.
-     *    @return string            Parsed character data.
-     *    @access public
-     */
-    function toParsedXml($text) {
-        return str_replace(
-                array('&', '<', '>', '"', '\''),
-                array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
-                $text);
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name   Name of test that is starting.
-     *    @param integer $size       Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        parent::paintGroupStart($test_name, $size);
-        print $this->_getIndent();
-        print "<" . $this->_namespace . "group size=\"$size\">\n";
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->_namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        print $this->_getIndent();
-        print "</" . $this->_namespace . "group>\n";
-        parent::paintGroupEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        parent::paintCaseStart($test_name);
-        print $this->_getIndent();
-        print "<" . $this->_namespace . "case>\n";
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->_namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        print $this->_getIndent();
-        print "</" . $this->_namespace . "case>\n";
-        parent::paintCaseEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        parent::paintMethodStart($test_name);
-        print $this->_getIndent();
-        print "<" . $this->_namespace . "test>\n";
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->_namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name   Name of test that is ending.
-     *    @param integer $progress   Number of test cases ending.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        print $this->_getIndent();
-        print "</" . $this->_namespace . "test>\n";
-        parent::paintMethodEnd($test_name);
-    }
-
-    /**
-     *    Paints pass as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintPass($message) {
-        parent::paintPass($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "pass>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "pass>\n";
-    }
-
-    /**
-     *    Paints failure as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "fail>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "fail>\n";
-    }
-
-    /**
-     *    Paints error as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "exception>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "exception>\n";
-    }
-
-    /**
-     *    Paints exception as XML.
-     *    @param Exception $exception    Exception to encode.
-     *    @access public
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "exception>";
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "exception>\n";
-    }
-
-    /**
-     *    Paints the skipping message and tag.
-     *    @param string $message        Text to display in skip tag.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "skip>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "skip>\n";
-    }
-
-    /**
-     *    Paints a simple supplementary message.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        parent::paintMessage($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "message>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "message>\n";
-    }
-
-    /**
-     *    Paints a formatted ASCII message such as a
-     *    variable dump.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        parent::paintFormattedMessage($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "formatted>";
-        print "<![CDATA[$message]]>";
-        print "</" . $this->_namespace . "formatted>\n";
-    }
-
-    /**
-     *    Serialises the event object.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-        parent::paintSignal($type, $payload);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "signal type=\"$type\">";
-        print "<![CDATA[" . serialize($payload) . "]]>";
-        print "</" . $this->_namespace . "signal>\n";
-    }
-
-    /**
-     *    Paints the test document header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     *    @abstract
-     */
-    function paintHeader($test_name) {
-        if (! SimpleReporter::inCli()) {
-            header('Content-type: text/xml');
-        }
-        print "<?xml version=\"1.0\"";
-        if ($this->_namespace) {
-            print " xmlns:" . $this->_namespace .
-                    "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
-        }
-        print "?>\n";
-        print "<" . $this->_namespace . "run>\n";
-    }
-
-    /**
-     *    Paints the test document footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     *    @abstract
-     */
-    function paintFooter($test_name) {
-        print "</" . $this->_namespace . "run>\n";
-    }
-}
-
-/**
- *    Accumulator for incoming tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingXmlTag {
-    var $_name;
-    var $_attributes;
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingXmlTag($attributes) {
-        $this->_name = false;
-        $this->_attributes = $attributes;
-    }
-
-    /**
-     *    Sets the test case/method name.
-     *    @param string $name        Name of test.
-     *    @access public
-     */
-    function setName($name) {
-        $this->_name = $name;
-    }
-
-    /**
-     *    Accessor for name.
-     *    @return string        Name of test.
-     *    @access public
-     */
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     *    Accessor for attributes.
-     *    @return hash        All attributes.
-     *    @access protected
-     */
-    function _getAttributes() {
-        return $this->_attributes;
-    }
-}
-
-/**
- *    Accumulator for incoming method tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingMethodTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingMethodTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintMethodStart($this->getName());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintMethodEnd($this->getName());
-    }
-}
-
-/**
- *    Accumulator for incoming case tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingCaseTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingCaseTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintCaseStart($this->getName());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintCaseEnd($this->getName());
-    }
-}
-
-/**
- *    Accumulator for incoming group tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingGroupTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingGroupTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintGroupStart($this->getName(), $this->getSize());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintGroupEnd($this->getName());
-    }
-
-    /**
-     *    The size in the attributes.
-     *    @return integer     Value of size attribute or zero.
-     *    @access public
-     */
-    function getSize() {
-        $attributes = $this->_getAttributes();
-        if (isset($attributes['SIZE'])) {
-            return (integer)$attributes['SIZE'];
-        }
-        return 0;
-    }
-}
-
-/**
- *    Parser for importing the output of the XmlReporter.
- *    Dispatches that output to another reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleTestXmlParser {
-    var $_listener;
-    var $_expat;
-    var $_tag_stack;
-    var $_in_content_tag;
-    var $_content;
-    var $_attributes;
-
-    /**
-     *    Loads a listener with the SimpleReporter
-     *    interface.
-     *    @param SimpleReporter $listener   Listener of tag events.
-     *    @access public
-     */
-    function SimpleTestXmlParser(&$listener) {
-        $this->_listener = &$listener;
-        $this->_expat = &$this->_createParser();
-        $this->_tag_stack = array();
-        $this->_in_content_tag = false;
-        $this->_content = '';
-        $this->_attributes = array();
-    }
-
-    /**
-     *    Parses a block of XML sending the results to
-     *    the listener.
-     *    @param string $chunk        Block of text to read.
-     *    @return boolean             True if valid XML.
-     *    @access public
-     */
-    function parse($chunk) {
-        if (! xml_parse($this->_expat, $chunk)) {
-            trigger_error('XML parse error with ' .
-                    xml_error_string(xml_get_error_code($this->_expat)));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Sets up expat as the XML parser.
-     *    @return resource        Expat handle.
-     *    @access protected
-     */
-    function &_createParser() {
-        $expat = xml_parser_create();
-        xml_set_object($expat, $this);
-        xml_set_element_handler($expat, '_startElement', '_endElement');
-        xml_set_character_data_handler($expat, '_addContent');
-        xml_set_default_handler($expat, '_default');
-        return $expat;
-    }
-
-    /**
-     *    Opens a new test nesting level.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             to start.
-     *    @access private
-     */
-    function _pushNestingTag($nested) {
-        array_unshift($this->_tag_stack, $nested);
-    }
-
-    /**
-     *    Accessor for current test structure tag.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             being parsed.
-     *    @access private
-     */
-    function &_getCurrentNestingTag() {
-        return $this->_tag_stack[0];
-    }
-
-    /**
-     *    Ends a nesting tag.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             just finished.
-     *    @access private
-     */
-    function _popNestingTag() {
-        return array_shift($this->_tag_stack);
-    }
-
-    /**
-     *    Test if tag is a leaf node with only text content.
-     *    @param string $tag        XML tag name.
-     *    @return @boolean          True if leaf, false if nesting.
-     *    @private
-     */
-    function _isLeaf($tag) {
-        return in_array($tag, array(
-                'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'SKIP', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
-    }
-
-    /**
-     *    Handler for start of event element.
-     *    @param resource $expat     Parser handle.
-     *    @param string $tag         Element name.
-     *    @param hash $attributes    Name value pairs.
-     *                               Attributes without content
-     *                               are marked as true.
-     *    @access protected
-     */
-    function _startElement($expat, $tag, $attributes) {
-        $this->_attributes = $attributes;
-        if ($tag == 'GROUP') {
-            $this->_pushNestingTag(new NestingGroupTag($attributes));
-        } elseif ($tag == 'CASE') {
-            $this->_pushNestingTag(new NestingCaseTag($attributes));
-        } elseif ($tag == 'TEST') {
-            $this->_pushNestingTag(new NestingMethodTag($attributes));
-        } elseif ($this->_isLeaf($tag)) {
-            $this->_in_content_tag = true;
-            $this->_content = '';
-        }
-    }
-
-    /**
-     *    End of element event.
-     *    @param resource $expat     Parser handle.
-     *    @param string $tag         Element name.
-     *    @access protected
-     */
-    function _endElement($expat, $tag) {
-        $this->_in_content_tag = false;
-        if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
-            $nesting_tag = $this->_popNestingTag();
-            $nesting_tag->paintEnd($this->_listener);
-        } elseif ($tag == 'NAME') {
-            $nesting_tag = &$this->_getCurrentNestingTag();
-            $nesting_tag->setName($this->_content);
-            $nesting_tag->paintStart($this->_listener);
-        } elseif ($tag == 'PASS') {
-            $this->_listener->paintPass($this->_content);
-        } elseif ($tag == 'FAIL') {
-            $this->_listener->paintFail($this->_content);
-        } elseif ($tag == 'EXCEPTION') {
-            $this->_listener->paintError($this->_content);
-        } elseif ($tag == 'SKIP') {
-            $this->_listener->paintSkip($this->_content);
-        } elseif ($tag == 'SIGNAL') {
-            $this->_listener->paintSignal(
-                    $this->_attributes['TYPE'],
-                    unserialize($this->_content));
-        } elseif ($tag == 'MESSAGE') {
-            $this->_listener->paintMessage($this->_content);
-        } elseif ($tag == 'FORMATTED') {
-            $this->_listener->paintFormattedMessage($this->_content);
-        }
-    }
-
-    /**
-     *    Content between start and end elements.
-     *    @param resource $expat     Parser handle.
-     *    @param string $text        Usually output messages.
-     *    @access protected
-     */
-    function _addContent($expat, $text) {
-        if ($this->_in_content_tag) {
-            $this->_content .= $text;
-        }
-        return true;
-    }
-
-    /**
-     *    XML and Doctype handler. Discards all such content.
-     *    @param resource $expat     Parser handle.
-     *    @param string $default     Text of default content.
-     *    @access protected
-     */
-    function _default($expat, $default) {
-    }
-}
-?>
diff --git a/tests/simpletest_to_junit.xsl b/tests/simpletest_to_junit.xsl
deleted file mode 100755
index e127f4b276..0000000000
--- a/tests/simpletest_to_junit.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <!-- convert xml output generated by simpletest xml into junit xml format -->
-  <xsl:output method="xml"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="run/group"/>
-  </xsl:template>
-
-  <xsl:template match="run/group">
-    <testsuite>
-      <xsl:attribute name="errors"><xsl:value-of select="count(.//exception)"/></xsl:attribute>
-      <xsl:attribute name="failures"><xsl:value-of select="count(.//fail)"/></xsl:attribute>
-      <xsl:attribute name="tests"><xsl:value-of select="count(.//test)"/></xsl:attribute>
-      <xsl:attribute name="name"><xsl:value-of select="name"/></xsl:attribute>
-      <xsl:attribute name="time"><xsl:value-of select="sum(//time)"/></xsl:attribute>
-      <xsl:apply-templates select=".//case/test"/>
-      <xsl:copy-of select="//system-err"/>
-    </testsuite>
-  </xsl:template>
-
-  <xsl:template match="case/test">
-    <testcase>
-      <xsl:attribute name="classname"><xsl:value-of select="../name"/></xsl:attribute>
-      <xsl:attribute name="name"><xsl:value-of select="name"/></xsl:attribute>
-      <xsl:attribute name="time"><xsl:value-of select="time"/></xsl:attribute>
-      <xsl:apply-templates select="fail"/>
-      <xsl:apply-templates select="exception"/>
-    </testcase>
-  </xsl:template>
-
-  <xsl:template match="fail">
-    <failure><xsl:attribute name="message"><xsl:value-of select="."/></xsl:attribute>
-    <!-- content is for stacktrace; not available / broken out by simpletest -->
-    </failure>
-  </xsl:template>
-
-  <xsl:template match="exception">
-    <!-- assuming same format as fail -->
-    <error><xsl:attribute name="message"><xsl:value-of select="."/></xsl:attribute>
-    <!-- content is for stacktrace; not available / broken out by simpletest -->
-    </error>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tests/test_manager.inc.php b/tests/test_manager.inc.php
deleted file mode 100755
index f7d9ffdf08..0000000000
--- a/tests/test_manager.inc.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-use ChamiloSession as Session;
-
-/* For licensing terms, see /license.txt */
-
-/**
-*	Code library for load functions than are needed to test
-*
-*	@author Arthur Portugal, Principal author
-*	@package chamilo.tests
-*/
-
-/**
- * @todo shouldn't these settings be moved to the test_suite.php
- * if these are really configuration then we can make require_once in each tests file.
- * @todo use this file to load in the setup in each file test.
- * @todo use this file to destroy in the teardown in each file test.
- * @todo check for duplication of "require_once" files with test_suite.php
- * @author Arthur Portugal
- */
-
-/*
-		INIT SECTION
-*/
-ini_set('memory_limit','256M');
-ini_set('max_execution_time','0');
-
-/*
-	Included libraries
-*/
-$maindir = dirname(__FILE__).'/../main/';
-$incdir  = dirname(__FILE__).'/../main/inc/';
-$libdir  = dirname(__FILE__).'/../main/inc/lib/';
-
-/**Files inside '/../main' */
-require_once $maindir.'permissions/permissions_functions.inc.php';
-require_once $maindir.'dropbox/dropbox_class.inc.php';
-require_once $maindir.'dropbox/dropbox_functions.inc.php';
-require_once $maindir.'survey/survey.lib.php';
-require_once $maindir.'exercise/export/scorm/scorm_classes.php';
-require_once $maindir.'exercise/export/qti2/qti2_classes.php';
-require_once $maindir.'exercise/export/exercise_import.inc.php';
-require_once $maindir.'exercise/exercise_result.class.php';
-require_once $maindir.'exercise/answer.class.php';
-require_once $maindir.'exercise/exercise.class.php';
-require_once $maindir.'exercise/fill_blanks.class.php';
-require_once $maindir.'exercise/freeanswer.class.php';
-require_once $maindir.'forum/forumfunction.inc.php';
-/*
-require_once $maindir.'gradebook/lib/be/gradebookitem.class.php';
-require_once $maindir.'gradebook/lib/be/abstractlink.class.php';
-require_once $maindir.'gradebook/lib/be/evallink.class.php';
-require_once $maindir.'gradebook/lib/be/linkfactory.class.php';
-require_once $maindir.'gradebook/lib/be/attendancelink.class.php';
-require_once $maindir.'gradebook/lib/be/category.class.php';
-require_once $maindir.'gradebook/lib/be/dropboxlink.class.php';
-require_once $maindir.'gradebook/lib/be/evaluation.class.php';
-require_once $maindir.'gradebook/lib/be/exerciselink.class.php';
-require_once $maindir.'gradebook/lib/be/dropboxlink.class.php';
-require_once $maindir.'gradebook/lib/be/result.class.php';
-require_once $maindir.'gradebook/lib/be/forumthreadlink.class.php';
-*/
-require_once $maindir.'course_info/download.lib.php';
-
-
-
-/**Files inside '/../main/lib/' */
-require_once $libdir.'urlmanager.lib.php';
-require_once $libdir.'fileDisplay.lib.php';
-require_once $libdir.'groupmanager.lib.php';
-require_once $libdir.'usermanager.lib.php';
-require_once $libdir.'social.lib.php';
-require_once $libdir.'xht.lib.php';
-require_once $libdir.'xmd.lib.php';
-require_once $libdir.'formvalidator/FormValidator.class.php';
-require_once $libdir.'exercise_show_functions.lib.php';
-require_once $libdir.'fileManage.lib.php';
-require_once $libdir.'notebook.lib.php';
-
-/**This files need be inside a buffering to clean the objects*/
-ob_start();
-require_once $libdir.'add_course.lib.inc.php';
-require_once $libdir.'geometry.lib.php';
-ob_end_clean();
-
-class TestManager
-{
-
-/* MAIN CODE */
-
-/**
- * This function create in the database a test course and will also load sessions.
- * This name will be change each time is used in the tests.
- * @param string	Course name
- * @return void
- */
-
-function create_test_course($course_code = 'TESTCOURSE') {
-
-	/* Table definitions */
-	$table_course 		= Database::get_main_table(TABLE_MAIN_COURSE);
-	$course_table 		= Database::get_main_table(TABLE_MAIN_COURSE);
-	$course_cat_table 	= Database::get_main_table(TABLE_MAIN_CATEGORY);
-
-	global $_configuration, $_user, $_course, $cidReq;
-	$cidReq = $course_code;
-
-	/*	Check if the course exists	*/
-
-	$sql = "SELECT code FROM  $table_course WHERE code = '$cidReq' ";
-	$rs = Database::query($sql, __FILE__, __LINE__);
-	$row = Database::fetch_row($rs);
-
-	/*	Create the course in the database */
-
-	if (empty($row[0])) {
-	    // Create a course
-	    $course_data = array(
-	            'wanted_code'=> $cidReq,
-	            'title'=>$cidReq,
-	            'tutor_name'=>'John Doe',
-	            'category_code'=>'LANG',
-	            'course_language'=>'spanish',
-	            'course_admin_id'=>'001',
-	            'db_prefix'=> $_configuration['db_prefix'],
-	            'firstExpirationDelay'=>'999'
-	            );
-	    $res = CourseManager::create_course($course_data['wanted_code'], $course_data['title'],
-	                         $course_data['tutor_name'], $course_data['category_code'],
-	                         $course_data['course_language'],$course_data['course_admin_id'],
-	                         $course_data['db_prefix'], $course_data['firstExpirationDelay']);
-	}
-
-
-	$sql =  "SELECT course.*, course_category.code faCode, course_category.name faName
-	         FROM $course_table
-	         LEFT JOIN $course_cat_table
-	         ON course.category_code = course_category.code
-	         WHERE course.code = '$cidReq'";
-
-	$result = Database::query($sql);
-
-	/*	Create the session	*/
-
-	if (Database::num_rows($result)>0) {
-	    $cData = Database::fetch_array($result);
-	    $_cid                            = $cData['code'             ];
-	    $_course 						 = array();
-	    $_course['id'          ]         = $cData['code'             ]; //auto-assigned integer
-	    $_course['name'        ]         = $cData['title'         	 ];
-	    $_course['official_code']        = $cData['visual_code'      ]; // use in echo
-	    $_course['sysCode'     ]         = $cData['code'             ]; // use as key in db
-	    $_course['path'        ]         = $cData['directory'		 ]; // use as key in path
-	    $_course['titular'     ]         = $cData['tutor_name'       ];
-	    $_course['language'    ]         = $cData['course_language'  ];
-	    $_course['extLink'     ]['url' ] = $cData['department_url'   ];
-	    $_course['extLink'     ]['name'] = $cData['department_name'  ];
-	    $_course['categoryCode']         = $cData['faCode'           ];
-	    $_course['categoryName']         = $cData['faName'           ];
-	    $_course['visibility'  ]         = $cData['visibility'		 ];
-	    $_course['subscribe_allowed']    = $cData['subscribe'		 ];
-	    $_course['unsubscribe']          = $cData['unsubscribe'		 ];
-
-	    Session::write('_cid',$_cid);
-	    Session::write('_course',$_course);
-	}
-
-	/*	Load the session	*/
-
-	$_SESSION['_user']['user_id'] = 1;
-	$_SESSION['is_courseAdmin'] = 1;
-	$_SESSION['show'] = showall;
-
-	/*		Load the user	*/
-
-	$_user['user_id'] = $_SESSION['_user']['user_id'];
-}
-
-/**
- * This function delete the test course from the database and destroy the sessions.
- * @param string the course code than will be delete.
- * @return void
- */
-
-function delete_test_course($course_code = 'TESTCOURSE') {
-	$res = CourseManager::delete_course($course_code);
-	$path = api_get_path(SYS_PATH).'archive';
-
-	if ($handle = opendir($path)) {
-		while (false !== ($file = readdir($handle))) {
-			if (strpos($file,$course_code)!==false) {
-				if (is_dir($path.'/'.$file)) {
-					rmdirr($path.'/'.$file);
-				}
-			}
-		}
-		closedir($handle);
-	}
-
-	//	Check api session destroy
-	if (!headers_sent() && session_id() != "") {
-		$res=Session::destroy();
-		}
-	}
-}
diff --git a/tests/test_suite.php b/tests/test_suite.php
deleted file mode 100755
index 333226f2d2..0000000000
--- a/tests/test_suite.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-/**
-*	This is the index file load when a user is testing functions in Chamilo.
-*
-*	Libraries loaded:
-*	- global.inc
-*	- files of simpletest
-*	- files with functions tests
-*
-*	@todo rewrite code to separate display, logic, database code
-*	@package chamilo.tests
-*/
-/**
- * @todo shouldn't these settings be moved to the test_suite.php.
- * 		 if these are really configuration then we can make require_once in each tests.
- * @todo use this file to load the setup in each file test.
- * @todo check for duplication of require with test_suite.php
- * @author aportugal
- */
-
-/**
- * Helpful info for newcomers
- *
- * @todo maybe not the right place?
- *
- * http://simpletest.sourceforge.net/en/unit_test_documentation.html
- *
-	assertTrue($x)					Fail if $x is false
-	assertFalse($x)					Fail if $x is true
-	assertNull($x)					Fail if $x is set
-	assertNotNull($x)				Fail if $x not set
-	assertIsA($x, $t)				Fail if $x is not the class or type $t
-	assertNotA($x, $t)				Fail if $x is of the class or type $t
-	assertEqual($x, $y)				Fail if $x == $y is false
-	assertNotEqual($x, $y)			Fail if $x == $y is true
-	assertWithinMargin($x, $y, $m)	Fail if abs($x - $y) < $m is false
-	assertOutsideMargin($x, $y, $m)	Fail if abs($x - $y) < $m is true
-	assertIdentical($x, $y)			Fail if $x == $y is false or a type mismatch
-	assertNotIdentical($x, $y)		Fail if $x == $y is true and types match
-	assertReference($x, $y)			Fail unless $x and $y are the same variable
-	assertClone($x, $y)				Fail unless $x and $y are identical copies
-	assertPattern($p, $x)			Fail unless the regex $p matches $x
-	assertNoPattern($p, $x)			Fail if the regex $p matches $x
-	expectError($x)					Swallows any upcoming matching error
-	assert($e)						Fail on failed expectation object $e
-*/
-
-/* Included libraries */
-
-//The global.inc.php be need be load here to can load the settings files
-$incdir = dirname(__FILE__).'/../main/inc/';
-require_once $incdir.'global.inc.php';
-
-//This file load the functions to create and destroy the course
-require_once api_get_path(SYS_TEST_PATH).'test_manager.inc.php';
-
-//Files than need simpletest to can test
-require_once 'simpletest/unit_tester.php';
-require_once 'simpletest/web_tester.php';
-require_once 'simpletest/mock_objects.php';
-require_once 'simpletest/autorun.php';
-require_once 'simpletest/reporter.php';
-require_once 'simpletest/xml.php';
-
-/**
- *  TEST SUITE
- * Start to load the tests files
- * @package chamilo.tests
- */
-class TestsSuite extends TestSuite
-{
-    public function _construct()
-    {
-        // Name of this test suite
-        $this->TestSuite('All tests suite');
-
-        // Loading test cases
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/database.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_course.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/calendar.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/surveymanager.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/session_handler.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/sessionmanager.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/export.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/legal.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/mail.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/message.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/online.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/security.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/specific_fields_manager.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/social.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/sortabletable.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/statsUtils.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/tablesort.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/text.lib.test.php');
-       	//$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/tracking.lib.test.php');
-    	//$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/blog.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/urlmanager.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/stats.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/course_document.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/display.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/document.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/events.lib.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/fileDisplay.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/fileManage.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/geometry.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/statistics/statistics.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_courses_to_sessions_functions.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/add_many_session_to_category_functions.lib.test.php');
-       	//$this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/access_urls.test.php');
-       	$this->addFile(api_get_path(SYS_TEST_PATH).'/main/admin/sub_language.class.test.php');
-       	$this->addFile(api_get_path(SYS_TEST_PATH).'/main/auth/lost_password.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/auth/openid/xrds.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/chat/chat_functions.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/hotpotatoes.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/lp/scorm.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/survey/survey.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/user/userInfoLib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/webservices/user_import/import.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/work/work.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/glossary.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/notebook.lib.test.php');
-//        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/permissions/permissions_functions.inc.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/dropbox/dropbox_class.inc.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/dropbox/dropbox_functions.inc.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/search/search_suggestions.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/export/qti2/qti2_classes.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/export/scorm/scorm_classes.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/usermanager.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/groupmanager.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/image.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/import.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/internationalization.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/system_announcements.lib.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/fileUpload.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/resourcelinker/resourcelinker.inc.test.php');
-
-
-        // These files are metadata libraries, not available to test
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/xht.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/xmd.lib.test.php');
-
-        // These files are not used and is not finished implement, not available to test
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/export/qti/qti_classes.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/export/qti2/qti2_export.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/export/exercise_import.inc.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/export/scorm/scorm_export.test.php');
-
-        // EXERCISES
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/answer.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/exercise_result.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/exercise_show_functions.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/exercise.class.test.php');
-        // This files have problem with class and call objects, is not available to test
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/exercise.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/fill_blanks.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/freeanswer.class.test.php');
-
-        // FORUM
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/forum/forumfunction.inc.test.php');
-
-        // GRADEBOOK
-/*        $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/attendancelink.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/category.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/dropboxlink.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/evaluation.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/exerciselink.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/forumthreadlink.class.test.php');
-*/
-        // NEW SCORM
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/learnpath.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/learnpathItem.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/openoffice_document.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/openoffice_presentation.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/openoffice_text_document.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/openoffice_text.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/scorm.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/scorm.lib.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/scormItem.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/scormOrganization.class.test.php');
-        //$this->addFile(api_get_path(SYS_TEST_PATH).'main/lp/scormResource.class.test.php');
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/main_api.lib.test.php');//this file delete the course
-        $this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/debug.lib.inc.test.php');//this file need be to the finish of the tests
-    }
-}
-$test = &new TestsSuite();
-$test->run(new XMLReporter());
diff --git a/tests/test_webservices.php b/tests/test_webservices.php
deleted file mode 100755
index ebaf899546..0000000000
--- a/tests/test_webservices.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-/**
- * Set of unit tests for the web services
- * 
- * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
- * @package chamilo.tests
- */
-/**
- * Init
- */
-ini_set('soap.wsdl_cache_enabled', 0);
-
-require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
-
-require_once(dirname(__FILE__).'/simpletest/autorun.php');
-/**
- * @package chamilo.tests
- */
-class TestSoapWebService extends UnitTestCase {
-	protected $_secret_key;
-	
-	protected $_encrypt_method;
-	
-	protected $_client;
-	
-	public function __construct() {
-		$configuration = $GLOBALS['_configuration'];
-		$security_key = $configuration['security_key'];
-		$ip_address = '::1';
-		$this->_secret_key = sha1($ip_address.$security_key);
-		$this->_encrypt_method = $configuration['password_encryption'];
-		$this->_client = new SoapClient($configuration['root_web'].'main/webservices/soap.php?wsdl');
-	}
-	
-	protected function getUserArray() {
-		$user = array(
-			'firstname' => 'Guillaume',
-			'lastname' => 'Viguier',
-			'status' => 5,
-			'loginname' => 'guillaumev',
-			'password' => 'guillaume',
-			'encrypt_method' => '',
-			'user_id_field_name' => 'chamilo_user_id',
-			'user_id_field_value' => '',
-			'visibility' => 1,
-			'email' => 'guillaume.viguier@beeznest.com',
-			'language' => 'english',
-			'phone' => '123456',
-			'expiration_date' => '0000-00-00 00:00:00',
-			'extras' => array());
-		return $user;
-	}
-	
-	protected function getCourseArray() {
-		$course = array(
-			'title' => 'My test course',
-			'category_code' => 'LANG',
-			'wanted_code' => '110',
-			'tutor_name' => 'Guillaume Viguier',
-			'course_admin_user_id_field_name' => 'chamilo_user_id',
-			'course_admin_user_id_value' => '1',
-			'language' => 'spanish',
-			'course_id_field_name' => 'chamilo_course_id',
-			'course_id_value' => '',
-			'extras' => array());
-		return $course;
-	}
-	
-	protected function getSessionArray() {
-		$end_date = date('Y') + 1;
-		$end_date .= '-'.date('m-d');
-		$session = array(
-			'name' => 'My session',
-			'start_date' => date('Y-m-d'),
-			'end_date' => $end_date,
-			'nb_days_access_before' => 0,
-			'nb_days_access_after' => 0,
-			'nolimit' => 0,
-			'visibility' => 1,
-			'user_id_field_name' => 'chamilo_user_id',
-			'user_id_value' => '1',
-			'session_id_field_name' => 'chamilo_session_id', 
-			'session_id_value' => '',
-			'extras' => array());
-		return $session;
-	}
-	
-	protected function soapCall($method, $arguments) {
-		return $this->_client->__soapCall($method, $arguments);
-	}
-	
-	protected function createUser() {
-		$user = $this->getUserArray();
-		$result = $this->soapCall('WSUser.CreateUser', array_merge(array('secret_key' => $this->_secret_key), $user));
-		return $result;
-	}
-	
-	protected function createCourse() {
-		$course = $this->getCourseArray();
-		$result = $this->soapCall('WSCourse.CreateCourse', array_merge(array('secret_key' => $this->_secret_key), $course));
-		return $result;
-	}
-	
-	public function testTest() {
-		$result = $this->soapCall('WS.test', array());
-		$this->assertEqual($result, "success");
-	}
-	
-	public function testInvalidKey() {
-		$secret_key = 'invalid';
-		try {
-			$this->soapCall('WSUser.DisableUser', array('secret_key' => $secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => 3));
-			$this->fail('Exception was expected');
-		} catch(SOAPFault $f) {
-			$this->pass();
-		}
-	}
-	
-	public function testCreateUser() {
-		$user = $this->getUserArray();
-		$result = $this->soapCall('WSUser.CreateUser', array_merge(array('secret_key' => $this->_secret_key), $user));
-		$this->assertIsA($result, 'int');
-		//Delete user created
-		$this->soapCall('WSUser.DeleteUser', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => $result));
-	}
-	
-	public function testCreateUserEncrypted() {
-		$user = $this->getUserArray();
-		$user['encrypt_method'] = $this->_encrypt_method;
-		if($this->_encrypt_method == 'md5') {
-			$user['password'] = md5('guillaume');
-		} else if($this->_encrypt_method == 'sha1') {
-			$user['password'] = sha1('guillaume');
-		}
-		$user['extras'] = array(array('field_name' => 'salt', 'field_value' => '1234'));
-		$result = $this->soapCall('WSUser.CreateUser', array_merge(array('secret_key' => $this->_secret_key), $user));
-		$this->assertIsA($result, 'int');
-		//Delete user created
-		$this->soapCall('WSUser.DeleteUser', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => $result));
-	}
-	
-	public function testCourseCreation() {
-		$course = $this->getCourseArray();
-		$result = $this->soapCall('WSCourse.CreateCourse', array_merge(array('secret_key' => $this->_secret_key), $course));
-		$this->assertIsA($result, 'int');
-		// Delete course created
-		$this->soapCall('WSCourse.DeleteCourse', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => $result));
-	}
-	
-	/*public function testCourseSubscriptionAndUnsubscription() {
-		//$course_id = $this->createCourse();
-		//$user_id = $this->createUser();
-		//echo $course_id.';'.$user_id;
-		//$this->soapCall('WSCourse.SubscribeUserToCourse', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => 38, 'status' => 1));
-		//$this->soapCall('WSCourse.UnsubscribeUserFromCourse', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => 38));
-	}*/
-	
-	/*public function testCourseDescriptions() {
-		//$this->soapCall('WSCourse.EditCourseDescription', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8, 'course_desc_id' => 1, 'course_desc_title' => 'My description', 'course_desc_content' => 'This is my new description'));
-		//$result = $this->soapCall('WSCourse.GetCourseDescriptions', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8));
-		//var_dump($result);
-		$result = $this->soapCall('WSCourse.ListCourses', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id'));
-		var_dump($result);
-	}*/
-	
-	public function testSessionCreation() {
-		$session = $this->getSessionArray();
-		$result = $this->soapCall('WSSession.CreateSession', array_merge(array('secret_key' => $this->_secret_key), $session));
-		$this->assertIsA($result, 'int');
-		$this->soapCall('WSSession.DeleteSession', array('secret_key' => $this->_secret_key, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => $result));
-	}
-	
-	/*public function testUserSessionSubscriptionAndUnsubscription() {
-		$this->soapCall('WSSession.UnsubscribeCourseFromSession', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => 3));
-		//$this->soapCall('WSSession.UnsubscribeUserFromSession', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => 38, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => 3));
-	}*/
-	
-	
-}
-
-

From 862f7ec73db0c2ca7df5b6c5095e89214a7bc97e Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 12:53:14 +0100
Subject: [PATCH 16/68] Fix course list see BT#12458

- Add order in query
- Use function get_courses_list_by_user_id instead of custom query
- Use url id in query instead of custom query
- Add new parameter bool $loadSpecialCourses (true by default as before)
---
 main/coursecopy/copy_course.php | 31 +++++++-------
 main/inc/lib/course.lib.php     | 71 +++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/main/coursecopy/copy_course.php b/main/coursecopy/copy_course.php
index 5ce0e6b5dd..30f53fce69 100755
--- a/main/coursecopy/copy_course.php
+++ b/main/coursecopy/copy_course.php
@@ -48,7 +48,6 @@ if (Security::check_token('post') && (
 ) {
     // Clear token
     Security::clear_token();
-
     if (isset($_POST['action']) && $_POST['action'] == 'course_select_form') {
         $course = CourseSelectForm::get_posted_course('copy_course');
     } else {
@@ -85,24 +84,22 @@ if (Security::check_token('post') && (
     $table_cu = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
     $user_info = api_get_user_info();
     $course_info = api_get_course_info();
-    $sql = 'SELECT *
-            FROM '.$table_c.' c, '.$table_cu.' cu
-            WHERE cu.c_id = c.id';
-    if (!api_is_platform_admin()) {
-        $sql .= ' AND cu.status=1 ';
-    }
-    $sql .= ' AND
-            cu.user_id = '.$user_info['user_id'].' AND
-            c.id != '."'".$course_info['real_id']."'".'
-            ORDER BY title ASC';
-    $res = Database::query($sql);
-    if (Database::num_rows($res) == 0) {
-        Display::display_normal_message(get_lang('NoDestinationCoursesAvailable'));
+    $courseList = CourseManager::get_courses_list_by_user_id(
+        $user_info['user_id'],
+        false,
+        false,
+        false
+    );
+
+    if (empty($courseList)) {
+        Display::addFlash(
+            Display::return_message(get_lang('NoDestinationCoursesAvailable'))
+        );
     } else {
         $options = array();
-        while ($obj = Database::fetch_object($res)) {
-            $courseInfo = api_get_course_info_by_id($obj->c_id);
-            $options[$courseInfo['code']] = $obj->title.' ('.$obj->code.')';
+        foreach ($courseList as $courseItem) {
+            $courseInfo = api_get_course_info_by_id($courseItem['real_id']);
+            $options[$courseInfo['code']] = $courseInfo['title'].' ('.$courseInfo['code'].')';
         }
 
         $form = new FormValidator(
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 141507fa33..1783b8dbb5 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -2683,13 +2683,15 @@ class CourseManager
      * @param boolean $include_sessions Whether to include courses from session or not
      * @param boolean $adminGetsAllCourses If the user is platform admin,
      * whether he gets all the courses or just his. Note: This does *not* include all sessions
+     * @param bool $loadSpecialCourses
      * @return array    List of codes and db name
      * @author isaac flores paz
      */
     public static function get_courses_list_by_user_id(
         $user_id,
         $include_sessions = false,
-        $adminGetsAllCourses = false
+        $adminGetsAllCourses = false,
+        $loadSpecialCourses = true
     ) {
         $user_id = intval($user_id);
         $urlId = api_get_current_access_url_id();
@@ -2700,7 +2702,7 @@ class CourseManager
         $tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
         $tbl_user_course_category = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
         $tableCourseUrl = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $special_course_list = self::get_special_course_list();
+
         if ($adminGetsAllCourses && UserManager::is_admin($user_id)) {
             // get the whole courses list
             $sql = "SELECT DISTINCT(course.code), course.id as real_id
@@ -2710,32 +2712,41 @@ class CourseManager
                     WHERE url.access_url_id = $urlId      
                 ";
         } else {
-            $with_special_courses = $without_special_courses = '';
-            if (!empty($special_course_list)) {
-                $sc_string = '"' . implode('","', $special_course_list) . '"';
-                $with_special_courses = ' AND course.id IN (' . $sc_string . ')';
-                $without_special_courses = ' AND course.id NOT IN (' . $sc_string . ')';
-            }
-
-            if (!empty($with_special_courses)) {
-                $sql = "SELECT DISTINCT(course.code), course.id as real_id
-                        FROM $tbl_course_user course_rel_user
-                        LEFT JOIN $tbl_course course
-                        ON course.id = course_rel_user.c_id
-                        LEFT JOIN $tbl_user_course_category user_course_category
-                        ON course_rel_user.user_course_cat = user_course_category.id
-                        INNER JOIN $tableCourseUrl url 
-                        ON (course.id = url.c_id)  
-                        WHERE url.access_url_id = $urlId $with_special_courses                        
-                        GROUP BY course.code
-                        ORDER BY user_course_category.sort, course.title, course_rel_user.sort ASC
-                ";
-                $rs_special_course = Database::query($sql);
-                if (Database::num_rows($rs_special_course) > 0) {
-                    while ($result_row = Database::fetch_array($rs_special_course)) {
-                        $result_row['special_course'] = 1;
-                        $course_list[] = $result_row;
-                        $codes[] = $result_row['real_id'];
+            $withSpecialCourses = $withoutSpecialCourses = '';
+            if ($loadSpecialCourses) {
+                $specialCourseList = self::get_special_course_list();
+
+                if (!empty($specialCourseList)) {
+                    $specialCourseToString = '"'.implode(
+                            '","',
+                            $specialCourseList
+                        ).'"';
+                    $withSpecialCourses = ' AND course.id IN ('.$specialCourseToString.')';
+                    $withoutSpecialCourses = ' AND course.id NOT IN ('.$specialCourseToString.')';
+                }
+
+                if (!empty($withSpecialCourses)) {
+                    $sql = "SELECT DISTINCT(course.code), course.id as real_id
+                            FROM $tbl_course_user course_rel_user
+                            LEFT JOIN $tbl_course course
+                            ON course.id = course_rel_user.c_id
+                            LEFT JOIN $tbl_user_course_category user_course_category
+                            ON course_rel_user.user_course_cat = user_course_category.id
+                            INNER JOIN $tableCourseUrl url 
+                            ON (course.id = url.c_id)  
+                            WHERE url.access_url_id = $urlId $withSpecialCourses                        
+                            GROUP BY course.code
+                            ORDER BY user_course_category.sort, course.title, course_rel_user.sort ASC
+                    ";
+                    $rs_special_course = Database::query($sql);
+                    if (Database::num_rows($rs_special_course) > 0) {
+                        while ($result_row = Database::fetch_array(
+                            $rs_special_course
+                        )) {
+                            $result_row['special_course'] = 1;
+                            $course_list[] = $result_row;
+                            $codes[] = $result_row['real_id'];
+                        }
                     }
                 }
             }
@@ -2751,7 +2762,9 @@ class CourseManager
                     WHERE 
                         url.access_url_id = $urlId AND 
                         cru.user_id = '$user_id' 
-                        $without_special_courses";
+                        $withoutSpecialCourses
+                    ORDER BY course.title
+                    ";
         }
         $result = Database::query($sql);
 

From 046f054871d820e61b51bb54163ca1210927447c Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 13:10:55 +0100
Subject: [PATCH 17/68] Add parameter $skipCourseList + fix message see
 BT#12458

---
 main/coursecopy/copy_course.php |  9 +++++----
 main/inc/lib/course.lib.php     | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/main/coursecopy/copy_course.php b/main/coursecopy/copy_course.php
index 30f53fce69..cf37e22914 100755
--- a/main/coursecopy/copy_course.php
+++ b/main/coursecopy/copy_course.php
@@ -6,6 +6,7 @@ use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
 use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;
 
 /**
+ * @todo rework file in order to use addFlash
  * @package chamilo.backup
  */
 
@@ -84,17 +85,17 @@ if (Security::check_token('post') && (
     $table_cu = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
     $user_info = api_get_user_info();
     $course_info = api_get_course_info();
+
     $courseList = CourseManager::get_courses_list_by_user_id(
         $user_info['user_id'],
         false,
         false,
-        false
+        false,
+        [$course_info['real_id']]
     );
 
     if (empty($courseList)) {
-        Display::addFlash(
-            Display::return_message(get_lang('NoDestinationCoursesAvailable'))
-        );
+        Display::display_normal_message(get_lang('NoDestinationCoursesAvailable'));
     } else {
         $options = array();
         foreach ($courseList as $courseItem) {
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 1783b8dbb5..40cb5d76df 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -2679,19 +2679,22 @@ class CourseManager
 
     /**
      * Get list of courses for a given user
+     *
      * @param int $user_id
      * @param boolean $include_sessions Whether to include courses from session or not
      * @param boolean $adminGetsAllCourses If the user is platform admin,
      * whether he gets all the courses or just his. Note: This does *not* include all sessions
      * @param bool $loadSpecialCourses
-     * @return array    List of codes and db name
+     * @param array $skipCourseList List of course ids to skip
+     * @return array List of codes and db name
      * @author isaac flores paz
      */
     public static function get_courses_list_by_user_id(
         $user_id,
         $include_sessions = false,
         $adminGetsAllCourses = false,
-        $loadSpecialCourses = true
+        $loadSpecialCourses = true,
+        $skipCourseList = []
     ) {
         $user_id = intval($user_id);
         $urlId = api_get_current_access_url_id();
@@ -2770,6 +2773,11 @@ class CourseManager
 
         if (Database::num_rows($result)) {
             while ($row = Database::fetch_array($result, 'ASSOC')) {
+                if (!empty($skipCourseList)) {
+                    if (in_array($row['real_id'], $skipCourseList)) {
+                        continue;
+                    }
+                }
                 $course_list[] = $row;
                 $codes[] = $row['real_id'];
             }
@@ -2782,6 +2790,11 @@ class CourseManager
                     WHERE user_id = $user_id AND s.c_id = c.id";
             $r = Database::query($sql);
             while ($row = Database::fetch_array($r, 'ASSOC')) {
+                if (!empty($skipCourseList)) {
+                    if (in_array($row['real_id'], $skipCourseList)) {
+                        continue;
+                    }
+                }
                 if (!in_array($row['real_id'], $codes)) {
                     $course_list[] = $row;
                 }

From 48f1666661221ba7550750f92e42969b48deadb9 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 14:14:36 +0100
Subject: [PATCH 18/68] Add logs.

---
 main/inc/lib/course.lib.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 40cb5d76df..9ba4796126 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -5209,15 +5209,21 @@ class CourseManager
 
         if ($editTeacherInSessions) {
             $sessions = SessionManager::get_session_by_course($courseId);
-
             if (!empty($sessions)) {
+                if ($logger) {
+                    $logger->addInfo("Edit teachers in sessions");
+                }
                 foreach ($sessions as $session) {
+                    $sessionId = $session['id'];
                     // Remove old and add new
                     if ($deleteSessionTeacherNotInList) {
                         foreach ($teachers as $userId) {
+                            if ($logger) {
+                                $logger->addInfo("Set coach #$userId in session #$sessionId of course #$courseId ");
+                            }
                             SessionManager::set_coach_to_course_session(
                                 $userId,
-                                $session['id'],
+                                $sessionId,
                                 $courseId
                             );
                         }
@@ -5229,9 +5235,12 @@ class CourseManager
 
                         if (!empty($teachersToDelete)) {
                             foreach ($teachersToDelete as $userId) {
+                                if ($logger) {
+                                    $logger->addInfo("Delete coach #$userId in session #$sessionId of course #$courseId ");
+                                }
                                 SessionManager::set_coach_to_course_session(
                                     $userId,
-                                    $session['id'],
+                                    $sessionId,
                                     $courseId,
                                     true
                                 );
@@ -5240,9 +5249,12 @@ class CourseManager
                     } else {
                         // Add new teachers only
                         foreach ($teachers as $userId) {
+                            if ($logger) {
+                                $logger->addInfo("Add coach #$userId in session #$sessionId of course #$courseId ");
+                            }
                             SessionManager::set_coach_to_course_session(
                                 $userId,
-                                $session['id'],
+                                $sessionId,
                                 $courseId
                             );
                         }

From e420d16e7d331ef1d765df542c2cf7c637406737 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 14:36:16 +0100
Subject: [PATCH 19/68] Fix PHP warning

---
 main/inc/lib/sessionmanager.lib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index b592490f13..1e37695b48 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -4549,7 +4549,6 @@ class SessionManager
                         if (isset($sessionId) && !empty($sessionId)) {
                             $session_id = $sessionId;
                             if (!empty($enreg['SessionName'])) {
-                                ///$params['name'] = $enreg['SessionName'];
                                 $sessionName = Database::escape_string($enreg['SessionName']);
                                 $sql = "UPDATE $tbl_session SET name = '$sessionName' WHERE id = $session_id";
                                 Database::query($sql);
@@ -5119,7 +5118,7 @@ class SessionManager
 
         $coaches = array();
         if (Database::num_rows($result) > 0) {
-            while ($row = Database::fetch_row($result)) {
+            while ($row = Database::fetch_array($result)) {
                 $coaches[] = $row['user_id'];
             }
         }

From e95f71fc3bc1c202fb9d4dd10ba1c776c0aa0804 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 14:59:51 +0100
Subject: [PATCH 20/68] Remove styleci.yml, disable duplication in codeclimate

---
 .codeclimate.yml |  5 +----
 .styleci.yml     | 49 ------------------------------------------------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 .styleci.yml

diff --git a/.codeclimate.yml b/.codeclimate.yml
index ad8c945f65..7e05497632 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -12,10 +12,7 @@ engines:
     config:
     standard: "PSR1,PSR2"
   duplication:
-    enabled: true
-    config:
-      languages:
-      - php
+    enabled: false
 
 ratings:
   paths:
diff --git a/.styleci.yml b/.styleci.yml
deleted file mode 100644
index aa6de9bb73..0000000000
--- a/.styleci.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-preset: symfony
-
-enabled:
-  - class_keyword_remove
-  - combine_consecutive_unsets
-  - long_array_syntax
-  - newline_after_open_tag
-  - no_php4_constructor
-  - no_useless_else
-  - ordered_class_elements
-  - ordered_use
-
-finder:
-  exclude:
-    - 'app/cache/*'
-    - 'app/logs/*'
-    - 'main/*'
-    - 'documentation/*'
-    - 'app/Migrations/*'
-    - 'app/Resources/*'
-    - 'main/admin/db.php'
-    - 'main/auth/cas/lib/CAS/*'
-    - 'main/inc/lib/browser/*'
-    - 'main/inc/lib/freemindflashbrowser/*'
-    - 'main/inc/lib/internationalization_database/*'
-    - 'main/inc/lib/javascript/*'
-    - 'main/inc/lib/kses-0.2.2/*'
-    - 'main/inc/lib/mimetex/*'
-    - 'main/inc/lib/nanogong/*'
-    - 'main/inc/lib/nusoap/*'
-    - 'main/inc/lib/opengraph/*'
-    - 'main/inc/lib/ppt2png/*'
-    - 'main/inc/lib/phpseclib'
-    - 'main/inc/lib/pear/*'
-    - 'main/inc/lib/phpmailer/*'
-    - 'main/inc/lib/phpseclib/*'
-    - 'main/inc/lib/svg-edit/*'
-    - 'main/inc/lib/swfobject/*'
-    - 'main/inc/lib/wami-recorder/*'
-    - 'main/inc/lib/xajax/*'
-    - 'main/lp/packaging/*'
-    - 'main/template/*'
-    - 'main/img/*'
-    - 'main/lang/*'
-    - 'main/default_course_document'
-    - 'fonts'
-    - 'tests/*'
-    - 'vendor/*'
-    - 'web/*'
\ No newline at end of file

From aca4540d0d6d929c2d1e72a5bcfa0dfe3e0148c0 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 15 Mar 2017 09:21:37 -0500
Subject: [PATCH 21/68] Minor - Update language files

---
 main/lang/english/trad4all.inc.php | 2 ++
 main/lang/spanish/trad4all.inc.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 8b901a77bc..3c165bbb5b 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -7975,4 +7975,6 @@ $PriorityChangeFromXToY = "Priority changed from %s to %s";
 $StatusChangeFromXToY = "Status changed from %s to %s";
 $SkillFromCourseXDeletedSinceThen = "This skill was obtained through course %s which has been removed since then.";
 $SaveAndAddNewItem = "Save and add new item";
+$AnnouncementChooseRecipientsDescription = "By default, this announcement will be sent to all users. But you can also select others recipients.";
+$ChooseRecipients = "Choose recipients";
 ?>
\ No newline at end of file
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index ac4b9fda22..d4e1dff23a 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -7990,4 +7990,6 @@ $PriorityChangeFromXToY = "Prioridad modificada de %s a %s";
 $StatusChangeFromXToY = "Estado modificado de %s a %s";
 $SkillFromCourseXDeletedSinceThen = "Esta competencia fue adquirida a través del curso %s que ha sido eliminado desde entonces.";
 $SaveAndAddNewItem = "Guardar y agregar nuevo elemento";
+$AnnouncementChooseRecipientsDescription = "De forma predeterminada, este anuncio será enviado a todos los usuarios. Pero también puede seleccionar otros destinatarios.";
+$ChooseRecipients = "Elegir destinatarios";
 ?>
\ No newline at end of file

From b13db12ec4a1b4196b42de7bd92d5df61136ea52 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 15 Mar 2017 09:22:29 -0500
Subject: [PATCH 22/68] Fix PHP warning - refs BT#12454

---
 main/announcements/announcements.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 6e8022d371..c5a60edd80 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -465,10 +465,14 @@ switch ($action) {
             }
         }
 
-        foreach ($defaults['users'] as $value) {
-            $parts = explode(':', $value);
+        if (isset($defaults['users'])) {
+            foreach ($defaults['users'] as $value) {
+                $parts = explode(':', $value);
+
+                if (!isset($parts[1]) || empty($parts[1])) {
+                    continue;
+                }
 
-            if (isset($parts[1]) && !empty($parts[1])) {
                 $form->addHtml("
                     <script>
                         $(document).on('ready', function () {

From c6df021b533e8e093bc1b82e92a4d6455c2db85b Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 15:30:14 +0100
Subject: [PATCH 23/68] Minor - Format code

---
 .../hotpotatoes_exercise_result.class.php     | 347 +++++++++---------
 1 file changed, 168 insertions(+), 179 deletions(-)

diff --git a/main/exercise/hotpotatoes_exercise_result.class.php b/main/exercise/hotpotatoes_exercise_result.class.php
index 21627e3eeb..cd6ce11cb2 100755
--- a/main/exercise/hotpotatoes_exercise_result.class.php
+++ b/main/exercise/hotpotatoes_exercise_result.class.php
@@ -14,17 +14,17 @@ class HotpotatoesExerciseResult
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 * @param string $document_path
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param    string        The document path (for HotPotatoes retrieval)
+     * @param    integer        User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     * @param string $document_path
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
-        $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
+        $TBL_TRACK_HOTPOTATOES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
         $cid             = api_get_course_id();
         $course_id       = api_get_course_int_id();
@@ -34,11 +34,11 @@ class HotpotatoesExerciseResult
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
-            $sql="SELECT firstname as userpart1, lastname as userpart2 ,
+            $sql = "SELECT firstname as userpart1, lastname as userpart2 ,
                     email,
                     tth.exe_name,
                     tth.exe_result,
@@ -50,9 +50,7 @@ class HotpotatoesExerciseResult
                             tth.exe_name = '$hotpotato_name'
                     ORDER BY tth.c_id ASC, tth.exe_date ASC";
         } else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
             // get only this user's results
-
             $sql = "SELECT '', exe_name, exe_result , exe_weighting, exe_date
                     FROM $TBL_TRACK_HOTPOTATOES
                     WHERE
@@ -65,39 +63,26 @@ class HotpotatoesExerciseResult
         $results = array();
 
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $results[] = $rowx;
         }
 
         $hpresults = array();
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $hpresults[] = $rowx;
         }
 
-        /*if ($filter) {
-            switch ($filter) {
-                case 1 :
-                    $filter_by_not_revised = true;
-                    break;
-                case 2 :
-                    $filter_by_revised = true;
-                    break;
-                default :
-                    null;
-            }
-        }*/
-
         // Print the Result of Hotpotatoes Tests
         if (is_array($hpresults)) {
-            for($i = 0; $i < sizeof($hpresults); $i++) {
+            for ($i = 0; $i < sizeof($hpresults); $i++) {
                 $return[$i] = array();
                 $title = GetQuizName($hpresults[$i]['exe_name'], $document_path);
                 if ($title =='') {
                     $title = basename($hpresults[$i]['exe_name']);
                 }
-                if(empty($user_id)) {
-                $return[$i]['email'] = $hpresults[$i]['email'];
+                if (empty($user_id)) {
+                    $return[$i]['email'] = $hpresults[$i]['email'];
                     $return[$i]['first_name'] = $hpresults[$i]['userpart1'];
                     $return[$i]['last_name'] = $hpresults[$i]['userpart2'];
                 }
@@ -111,60 +96,49 @@ class HotpotatoesExerciseResult
         $this->results = $return;
 
         return true;
-	}
+    }
 
+    /**
+     * Exports the complete report as a CSV file
+     * @param string $document_path Document path inside the document tool
+     * @param string $hotpotato_name
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path = '', $hotpotato_name = '')
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
         $data .= get_lang('Email').';';
-
-		/*if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
-			$num = count($extra_user_fields);
-			foreach($extra_user_fields as $field) {
-				$data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
-			}
-		}*/
-
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
-
-		//results
-		foreach($this->results as $row) {
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
+
+        // Results
+        foreach ($this->results as $row) {
             if (api_is_western_name_order()) {
               $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
               $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
@@ -174,49 +148,46 @@ class HotpotatoesExerciseResult
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
 
-			/*if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
-				}
-			}*/
-
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @param string $document_path
+     * @param null $user_id
+     * @param bool $export_user_fields
+     * @param int $export_filter
+     * @param int $exercise_id
+     * @param null $hotpotato_name
+     * @return bool
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -225,36 +196,41 @@ class HotpotatoesExerciseResult
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting(
+            $document_path,
+            $user_id,
+            $export_filter,
+            $exercise_id,
+            $hotpotato_name
+        );
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
-
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
+            $column++;
             if (api_is_western_name_order()) {
-    			$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
-    			$column++;
+                $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
+                $column++;
                 $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('LastName'));
                 $column++;
             } else {
@@ -263,14 +239,21 @@ class HotpotatoesExerciseResult
                 $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
                 $column++;
             }
-		}
-
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        }
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(
+                0,
+                1000,
+                5,
+                'ASC',
+                false,
+                1
+            );
+
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
                 $worksheet->setCellValueByColumnAndRow(
                     $column,
                     $line,
@@ -280,27 +263,27 @@ class HotpotatoesExerciseResult
                         $charset
                     )
                 );
-				$column++;
-			}
-		}
+                $column++;
+            }
+        }
 
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Title'));
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('StartDate'));
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Title'));
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('StartDate'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('EndDate'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Score'));
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Score'));
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Total'));
+        $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->setCellValueByColumnAndRow(
@@ -325,38 +308,44 @@ class HotpotatoesExerciseResult
                     $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
-
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
-
-			$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['start_date']);
+            }
+
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data(
+                    $row['user_id'],
+                    false,
+                    false,
+                    false,
+                    true
+                );
+                foreach ($user_fields_values as $value) {
+                    $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
+
+            $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['start_date']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
             $column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['duration']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['result']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['max']);
             $column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['duration']);
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['result']);
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['max']);
-			$column++;
             $worksheet->setCellValueByColumnAndRow($column, $line, $row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

From 5607dbcde507f384101c843e9bfc0f91f35bcd40 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 15:31:14 +0100
Subject: [PATCH 24/68] Remove unused parameter $hotpotato_name

---
 main/exercise/exercise_result.class.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/main/exercise/exercise_result.class.php b/main/exercise/exercise_result.class.php
index e144ae621a..75a93e6bdc 100755
--- a/main/exercise/exercise_result.class.php
+++ b/main/exercise/exercise_result.class.php
@@ -36,20 +36,18 @@ class ExerciseResult
      * @param int $user_id User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
      * @param int $filter
      * @param int $exercise_id
-     * @param null $hotpotato_name
+     *
      * @return bool
      */
     public function getExercisesReporting(
         $document_path,
         $user_id = null,
         $filter = 0,
-        $exercise_id = 0,
-        $hotpotato_name = null
+        $exercise_id = 0
     ) {
         $return = array();
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $TBL_TABLE_LP_MAIN = Database::get_course_table(TABLE_LP_MAIN);
-
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
         $TBL_TRACK_ATTEMPT_RECORDING = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
@@ -276,32 +274,29 @@ class ExerciseResult
         return true;
     }
 
-	/**
-     * Exports the complete report as a CSV file     *
+    /**
+     * Exports the complete report as a CSV file
      * @param    string $document_path Document path inside the document tool
      * @param    integer $user_id Optional user ID
      * @param    boolean $export_user_fields Whether to include user fields or not
      * @param    int $export_filter
      * @param    int $exercise_id
-     * @param    string $hotpotato_name
      *
-	 * @return	boolean		False on error
-	 */
+     * @return  boolean False on error
+     */
     public function exportCompleteReportCSV(
         $document_path = '',
         $user_id = null,
         $export_user_fields = false,
         $export_filter = 0,
-        $exercise_id = 0,
-        $hotpotato_name = null
+        $exercise_id = 0
     ) {
         global $charset;
         $this->getExercisesReporting(
             $document_path,
             $user_id,
             $export_filter,
-            $exercise_id,
-            $hotpotato_name
+            $exercise_id
         );
         $now = api_get_local_time();
         $filename = 'exercise_results_'.$now.'.csv';

From daff21618f8c4f5173d612ce02ef96f935b57c39 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 15:31:25 +0100
Subject: [PATCH 25/68] Add log

---
 main/cron/import_csv.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index d8f6090489..0ab7f2971a 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1300,6 +1300,7 @@ class ImportCsv
                     }
 
                     if ($addTeacherToSession) {
+                        $this->logger->addInfo("Add teacher to all course sessions");
                         CourseManager::updateTeachers(
                             $courseInfo,
                             $row['teachers'],

From 78925cd36f419ea25f95fb381488f2824c3b0ad7 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 15:32:17 +0100
Subject: [PATCH 26/68] Event::event_download() only if file is found

- Fix if item doesn't exists.
---
 main/work/work.lib.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index b8463b887d..b26134cd0c 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -2802,7 +2802,6 @@ function getStudentSubscribedToWork(
     } else {
         return $usersInWork;
     }
-
 }
 
 /**
@@ -4944,16 +4943,16 @@ function getFileContents($id, $course_info, $sessionId = 0, $correction = false)
                 $sessionId
             );
 
+            if (empty($item_info)) {
+                return false;
+            }
+
             allowOnlySubscribedUser(
                 api_get_user_id(),
                 $row['parent_id'],
                 $course_info['real_id']
             );
 
-            if (empty($item_info)) {
-                api_not_allowed();
-            }
-
             /*
             field show_score in table course :
                 0 =>    New documents are visible for all users
@@ -4989,7 +4988,7 @@ function getFileContents($id, $course_info, $sessionId = 0, $correction = false)
             $student_is_owner_of_work = user_is_author($row['id'], $row['user_id']);
 
             if ($is_editor ||
-                ($student_is_owner_of_work) ||
+                $student_is_owner_of_work ||
                 ($doc_visible_for_all && $work_is_visible)
             ) {
                 $title = $row['title'];
@@ -5011,12 +5010,12 @@ function getFileContents($id, $course_info, $sessionId = 0, $correction = false)
                     }
                 }
 
-                Event::event_download($title);
-
                 if (Security::check_abs_path(
                     $full_file_name,
                     api_get_path(SYS_COURSE_PATH).api_get_course_path().'/')
                 ) {
+                    Event::event_download($title);
+
                     return array(
                         'path' => $full_file_name,
                         'title' => $title,

From dcca7c03c744c9a46cfc009b2d782bf5a105d0e9 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 15:32:28 +0100
Subject: [PATCH 27/68] Update

---
 .codeclimate.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 7e05497632..016cc0b98e 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -11,6 +11,10 @@ engines:
     enabled: true
     config:
     standard: "PSR1,PSR2"
+    checks:
+      PSR1 Classes ClassDeclaration MissingNamespace:
+        enabled: false
+
   duplication:
     enabled: false
 

From d0d332a6677f77e741e948d6118b4f5437ec0e4b Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 15:40:37 +0100
Subject: [PATCH 28/68] Fix parameters, add int casting.

---
 .../src/buy_course_plugin.class.php           | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php
index 3392502699..e71ca0c7c1 100644
--- a/plugin/buycourses/src/buy_course_plugin.class.php
+++ b/plugin/buycourses/src/buy_course_plugin.class.php
@@ -1895,26 +1895,31 @@ class BuyCoursesPlugin extends Plugin
      * @return array
      */
     public function getServiceSale(
-        $id = null,
-        $buyerId = null,
-        $status = null,
-        $nodeType = null,
-        $nodeId = null,
+        $id = 0,
+        $buyerId = 0,
+        $status = 0,
+        $nodeType = 0,
+        $nodeId = 0,
         $hot = false
     ) {
         $servicesTable = Database::get_main_table(BuyCoursesPlugin::TABLE_SERVICES);
         $servicesSaleTable = Database::get_main_table(BuyCoursesPlugin::TABLE_SERVICES_SALE);
 
         $conditions = null;
-        $showData = "all";
-        $groupBy = "";
-
-        if ($id) {
+        $showData = 'all';
+        $groupBy = '';
+        $id = (int) $id;
+        $buyerId = (int) $buyerId;
+        $status = (int) $status;
+        $nodeType = (int) $nodeType;
+        $nodeId = (int) $nodeId;
+
+        if (!empty($id)) {
             $conditions = ['WHERE' => ['ss.id = ?' => $id]];
             $showData = "first";
         }
 
-        if ($buyerId) {
+        if (!empty($buyerId)) {
             $conditions = ['WHERE' => ['ss.buyer_id = ?' => $buyerId], 'ORDER' => 'id ASC'];
         }
 

From 657e5d369a3a5ec76b34792b66ae69b20b2e1450 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 16:00:08 +0100
Subject: [PATCH 29/68] If only one course in session then delete coaches see
 BT#12451

---
 main/inc/lib/sessionmanager.lib.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 1e37695b48..906535c3f8 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -4409,6 +4409,14 @@ class SessionManager
                     $coach_id = $defaultUserId;
                 }
 
+                $users = explode('|', $enreg['Users']);
+                $courses = explode('|', $enreg['Courses']);
+
+                $deleteOnlyCourseCoaches = false;
+                if (count($courses) == 1) {
+                    $deleteOnlyCourseCoaches = true;
+                }
+
                 if (!$updateSession) {
                     // Always create a session.
                     $unique_name = false;
@@ -4523,6 +4531,11 @@ class SessionManager
                                         WHERE session_id = '$session_id' AND status <> 2";
                                 Database::query($sql);
                             }
+                            if ($deleteOnlyCourseCoaches) {
+                                $sql = "DELETE FROM $tbl_session_course_user
+                                        WHERE session_id = '$session_id' AND status in ('2')";
+                                Database::query($sql);
+                            }
                         }
                     } else {
                         // Updating the session.
@@ -4613,6 +4626,12 @@ class SessionManager
                                         WHERE session_id = '$session_id' AND status <> 2";
                                 Database::query($sql);
                             }
+
+                            if ($deleteOnlyCourseCoaches) {
+                                $sql = "DELETE FROM $tbl_session_course_user
+                                        WHERE session_id = '$session_id' AND status in ('2')";
+                                Database::query($sql);
+                            }
                         } else {
                             if ($debug) {
                                 $logger->addError(
@@ -4625,11 +4644,9 @@ class SessionManager
                 }
 
                 $sessionList[] = $session_id;
-                $users = explode('|', $enreg['Users']);
 
                 // Adding the relationship "Session - User" for students
                 $userList = array();
-
                 if (is_array($users)) {
                     foreach ($users as $user) {
                         $user_id = UserManager::get_user_id_from_username($user);
@@ -4668,7 +4685,6 @@ class SessionManager
                     }
                 }
 
-                $courses = explode('|', $enreg['Courses']);
 
                 // See BT#6449
                 $onlyAddFirstCoachOrTeacher = false;

From 0ea059a48852236d4ebb6d01d4c72c712f7d1b64 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 15 Mar 2017 10:05:50 -0500
Subject: [PATCH 30/68] Fix Behat test for create an announcement - refs
 BT#12454

---
 tests/behat/features/toolAnnouncement.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/behat/features/toolAnnouncement.feature b/tests/behat/features/toolAnnouncement.feature
index 83fe17c366..05523ab1ac 100644
--- a/tests/behat/features/toolAnnouncement.feature
+++ b/tests/behat/features/toolAnnouncement.feature
@@ -10,6 +10,7 @@ Feature: Announcement tool
     Given I am on "/main/announcements/announcements.php?action=add&cidReq=TEMP"
     When I fill in the following:
       | title   | Announcement test                       |
+    And I press "choose_recipients"
     And I select "John Doe" from "users-f"
     And I press "add"
     And I fill in ckeditor field "content" with "Announcement description"

From 9f88778d40016714e19b07e04278fa7a9159ac2c Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 15 Mar 2017 10:13:12 -0500
Subject: [PATCH 31/68] Add Behat test for sent announcement for all user -
 refs BT#12454

---
 tests/behat/features/toolAnnouncement.feature | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/behat/features/toolAnnouncement.feature b/tests/behat/features/toolAnnouncement.feature
index 05523ab1ac..2bf4c63dad 100644
--- a/tests/behat/features/toolAnnouncement.feature
+++ b/tests/behat/features/toolAnnouncement.feature
@@ -6,7 +6,7 @@ Feature: Announcement tool
     Given I am a platform administrator
     And I am on course "TEMP" homepage
 
-  Scenario: Create an announcement
+  Scenario: Create an announcement for admin user
     Given I am on "/main/announcements/announcements.php?action=add&cidReq=TEMP"
     When I fill in the following:
       | title   | Announcement test                       |
@@ -17,10 +17,16 @@ Feature: Announcement tool
     And I press "submit"
     Then I should see "Announcement has been added"
 
+  Scenario: Create an announcement for all users
+    Given I am on "/main/announcements/announcements.php?action=add&cidReq=TEMP"
+    When I fill in the following:
+      | title   | Announcement test                       |
+    And I fill in ckeditor field "content" with "Announcement description"
+    And I press "submit"
+    Then I should see "Announcement has been added"
+
   Scenario: Delete all announcements
     Given I am on "/main/announcements/announcements.php?cidReq=TEMP"
     When I follow "Clear list of announcements"
     And I confirm the popup
     Then I should see "All announcements have been deleted"
-
-

From 7d2190c39d8c8b6d76c7d7e280fac02f5f9a08a2 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 15 Mar 2017 23:11:53 +0100
Subject: [PATCH 32/68] Fix behat tests

---
 tests/behat/behat.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/behat/behat.yml b/tests/behat/behat.yml
index d77c9d512b..6ca569e58b 100644
--- a/tests/behat/behat.yml
+++ b/tests/behat/behat.yml
@@ -1,7 +1,7 @@
 default:
     extensions:
         Behat\MinkExtension:
-          base_url: http://localhost/chamilo_111/
+          base_url: http://localhost/
           goutte: ~
           show_cmd: 'open %s'
           selenium2:
@@ -13,4 +13,4 @@ default:
         default:
             paths: [ %paths.base%/features ]
     formatters:
-        pretty: true
\ No newline at end of file
+        pretty: true

From a12a2fe8367d555424b5ea1c8383704a252e3daa Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 09:20:42 +0100
Subject: [PATCH 33/68] courses csv import - Delete teachers if not in list see
 BT#12451

---
 main/cron/import_csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 0ab7f2971a..f1e44c9d15 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1314,7 +1314,7 @@ class ImportCsv
                         CourseManager::updateTeachers(
                             $courseInfo,
                             $row['teachers'],
-                            false,
+                            true,
                             false,
                             false,
                             $teacherBackup,

From 0f6f21b7ace9630bc185f4eded2581547b14abaf Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 09:53:42 +0100
Subject: [PATCH 34/68] Fix userportal course list  BT#12461

- Course cat can be 0 or null,
- Avoid double courses
---
 main/inc/lib/course.lib.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 9ba4796126..beff723821 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -3675,6 +3675,8 @@ class CourseManager
     public static function returnCoursesCategories($user_category_id, $load_dirs = false)
     {
         $user_id = api_get_user_id();
+        $user_category_id = (int) $user_category_id;
+
         // Table definitions
         $TABLECOURS = Database:: get_main_table(TABLE_MAIN_COURSE);
         $TABLECOURSUSER = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -3683,13 +3685,17 @@ class CourseManager
 
         // Get course list auto-register
         $special_course_list = self::get_special_course_list();
-
         $without_special_courses = '';
         if (!empty($special_course_list)) {
             $without_special_courses = ' AND course.id NOT IN ("' . implode('","', $special_course_list) . '")';
         }
 
-        $sql = "SELECT
+        $userCategoryCondition = " (course_rel_user.user_course_cat = $user_category_id) ";
+        if (empty($user_category_id)) {
+            $userCategoryCondition = ' (course_rel_user.user_course_cat = 0 OR course_rel_user.user_course_cat IS NULL) ';
+        }
+
+        $sql = "SELECT DISTINCT
                     course.id,
                     course_rel_user.status status
                 FROM $TABLECOURS course 
@@ -3699,22 +3705,22 @@ class CourseManager
                 ON (url.c_id = course.id)
                 WHERE
                     course_rel_user.user_id = '" . $user_id . "' AND
-                    course_rel_user.user_course_cat = '" . $user_category_id . "'
+                    $userCategoryCondition
                     $without_special_courses ";
 
         // If multiple URL access mode is enabled, only fetch courses
         // corresponding to the current URL.
         if (api_get_multiple_access_url() && $current_url_id != -1) {
-            $sql .= " AND url.c_id = course.id AND access_url_id='" . $current_url_id . "'";
+            $sql .= " AND access_url_id='" . $current_url_id . "'";
         }
         // Use user's classification for courses (if any).
         $sql .= " ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
-
         $result = Database::query($sql);
 
         $courseList = array();
         $showCustomIcon = api_get_setting('course_images_in_courses_list');
         // Browse through all courses.
+        $courseAdded = [];
         while ($row = Database::fetch_array($result)) {
             $course_info = api_get_course_info_by_id($row['id']);
             if (isset($course_info['visibility']) &&
@@ -3722,6 +3728,11 @@ class CourseManager
             ) {
                 continue;
             }
+
+            // Skip if already in list
+            if (in_array($course_info['real_id'], $courseAdded)) {
+                continue;
+            }
             $course_info['id_session'] = null;
             $course_info['status'] = $row['status'];
             // For each course, get if there is any notification icon to show
@@ -3784,7 +3795,7 @@ class CourseManager
             if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                 $params['notifications'] = $showNotification;
             }
-
+            $courseAdded[] = $course_info['real_id'];
             $courseList[] = $params;
         }
 

From 38b4b602c891b5ecf05624cc48e0d966be1c34dd Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 10:07:26 +0100
Subject: [PATCH 35/68] Update

---
 .codeclimate.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 016cc0b98e..7bd740880a 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -14,6 +14,8 @@ engines:
     checks:
       PSR1 Classes ClassDeclaration MissingNamespace:
         enabled: false
+      PSR1 Files SideEffects FoundWithSymbols:
+        enabled: false
 
   duplication:
     enabled: false

From eccf89ae5c4a192ff5f6b00eac6eb4db9abe1258 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 13:16:39 +0100
Subject: [PATCH 36/68] Skip shibboleth code

---
 .codeclimate.yml |  1 +
 .scrutinizer.yml | 55 +++++++++---------------------------------------
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 7bd740880a..ac4ffe2374 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -33,6 +33,7 @@ exclude_paths:
 - app/Resources/
 - main/admin/db.php
 - main/auth/cas/lib/CAS/
+- main/auth/shibboleth
 - main/inc/lib/browser/
 - main/inc/lib/freemindflashbrowser/
 - main/inc/lib/internationalization_database/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index f916fb7c08..63bb3519bf 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -11,42 +11,6 @@ build:
                 'phar.readonly': false
         hosts:
             my.chamilodev.net: '127.0.0.1'
-filter:
-    excluded_paths:
-      - 'app/cache/*'
-      - 'app/logs/*'
-      - 'documentation/*'
-      - 'app/Migrations/*'
-      - 'app/Resources/*'
-      - 'main/admin/db.php'
-      - 'main/auth/cas/lib/CAS/*'
-      - 'main/inc/lib/browser/*'
-      - 'main/inc/lib/freemindflashbrowser/*'
-      - 'main/inc/lib/internationalization_database/*'
-      - 'main/inc/lib/javascript/*'
-      - 'main/inc/lib/kses-0.2.2/*'
-      - 'main/inc/lib/mimetex/*'
-      - 'main/inc/lib/nanogong/*'
-      - 'main/inc/lib/nusoap/*'
-      - 'main/inc/lib/opengraph/*'
-      - 'main/inc/lib/ppt2png/*'
-      - 'main/inc/lib/phpseclib'
-      - 'main/inc/lib/pear/*'
-      - 'main/inc/lib/phpmailer/*'
-      - 'main/inc/lib/phpseclib/*'
-      - 'main/inc/lib/svg-edit/*'
-      - 'main/inc/lib/swfobject/*'
-      - 'main/inc/lib/wami-recorder/*'
-      - 'main/inc/lib/xajax/*'
-      - 'main/lp/packaging/*'
-      - 'main/template/*'
-      - 'main/img/*'
-      - 'main/lang/*'
-      - 'main/default_course_document'
-      - 'fonts'
-      - 'tests/*'
-      - 'vendor/*'
-      - 'web/*'
 checks:
     php:
         no_trailing_whitespace: true
@@ -119,15 +83,15 @@ coding_style:
             constants:
                 true_false_null: lower
 
-tools:
-    php_mess_detector:
-        enabled: true
-        extensions:
-            - php
-        command: phpmd
-        config:
-            rulesets:
-                - codesize
+#tools:
+#    php_mess_detector:
+#        enabled: true
+#        extensions:
+#            - php
+#        command: phpmd
+#        config:
+#            rulesets:
+#                - codesize
 
 #    php_analyzer:
 #        enabled: true
@@ -168,6 +132,7 @@ filter:
         - 'app/Resources/*'
         - 'main/admin/db.php'
         - 'main/auth/cas/lib/CAS/*'
+        - 'main/auth/shibboleth'
         - 'main/inc/lib/browser/*'
         - 'main/inc/lib/freemindflashbrowser/*'
         - 'main/inc/lib/internationalization_database/*'

From cc74cb2e2eea1472643d1fee6503ce6f5e988f52 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 13:33:51 +0100
Subject: [PATCH 37/68] Update

---
 .codeclimate.yml | 2 ++
 .scrutinizer.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index ac4ffe2374..629529d74c 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -27,8 +27,10 @@ ratings:
   - '**.css'
 
 exclude_paths:
+- cli-config.php
 - app/cache/
 - app/logs/
+- app/config/
 - app/Migrations/
 - app/Resources/
 - main/admin/db.php
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 63bb3519bf..2e4ebb8bbd 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -125,8 +125,10 @@ coding_style:
 
 filter:
       excluded_paths:
+        - 'cli-config.php'
         - 'app/cache/*'
         - 'app/logs/*'
+        - 'app/config/*'
         - 'documentation/*'
         - 'app/Migrations/*'
         - 'app/Resources/*'

From a541e283a128cf899416f8e7d8b607e072389058 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 14:10:19 +0100
Subject: [PATCH 38/68] Add if date condition.

---
 main/template/default/export/table_pdf.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/template/default/export/table_pdf.tpl b/main/template/default/export/table_pdf.tpl
index 7c44e2735d..47603e8f84 100755
--- a/main/template/default/export/table_pdf.tpl
+++ b/main/template/default/export/table_pdf.tpl
@@ -38,7 +38,7 @@
             {% endif %}
         </tr>
 
-        {% if pdf_session_info.access_start_date != '' and pdf_session_info.access_end_date is not empty %}
+        {% if pdf_session_info.access_start_date != '' and pdf_session_info.access_end_date is not empty and pdf_session_info.access_end_date != '0000-00-00' %}
         <tr>
             <td>
                 <strong>{{ "PeriodToDisplay" | get_lang }}:</strong> {{ "FromDateXToDateY"| get_lang | format(pdf_session_info.access_start_date, pdf_session_info.access_end_date ) }}

From 6d0f05e2ac3a6be9945eb3853d2ebf4c559db590 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 14:24:05 +0100
Subject: [PATCH 39/68] Remove old file.

- Didn't work (fatal error) in global.inc
- Never used in the platform.
---
 404.php | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100755 404.php

diff --git a/404.php b/404.php
deleted file mode 100755
index f53ea3a683..0000000000
--- a/404.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-// HTTP404 page with neat styling
-// 2011, Jean-Karim Bockstael <jeankarim@cblue.be>
-// ErrorDocument 404 /404/
-require_once '../main/inc/global.inc.php';
-
-$msg = get_lang('FileNotFound');
-Display::display_header($msg);
-Display::display_error_message($msg);
-Display::display_footer();
-

From 214c2b4f19c648d841aeb508923d7a1c828fa350 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 14:49:18 +0100
Subject: [PATCH 40/68] Skip vendor libs

---
 .codeclimate.yml | 2 ++
 .scrutinizer.yml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 629529d74c..b3d42c2bfa 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -55,6 +55,8 @@ exclude_paths:
 - main/template/
 - main/img/
 - main/lang/
+- plugin/kannelsms/vendor/
+- plugin/clockworksms/vendor/
 - tests/
 - vendor/
 - web/
\ No newline at end of file
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 2e4ebb8bbd..6dce8ce8fc 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -158,7 +158,8 @@ filter:
         - 'main/img/*'
         - 'main/lang/*'
         - 'main/default_course_document'
-        - 'fonts'
+        - 'plugin/kannelsms/vendor/*'
+        - 'plugin/clockworksms/vendor/*'
         - 'tests/*'
         - 'vendor/*'
         - 'web/*'

From 9b4780a691c69477be238a0dd2c63bcb683eb690 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Thu, 16 Mar 2017 13:49:35 +0000
Subject: [PATCH 41/68] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 main/auth/conditional_login/complete_phone_number.php | 2 +-
 main/auth/lostPassword.php                            | 2 +-
 main/mySpace/course.php                               | 4 ++--
 news_list.php                                         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/auth/conditional_login/complete_phone_number.php b/main/auth/conditional_login/complete_phone_number.php
index 0deac670e8..6bc5a9321e 100755
--- a/main/auth/conditional_login/complete_phone_number.php
+++ b/main/auth/conditional_login/complete_phone_number.php
@@ -5,7 +5,7 @@ require_once dirname(__FILE__).'/../../inc/global.inc.php';
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">
diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php
index 99ceba3475..8612c04cef 100755
--- a/main/auth/lostPassword.php
+++ b/main/auth/lostPassword.php
@@ -23,7 +23,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 // Forbidden to retrieve the lost password
 if (api_get_setting('allow_lostpassword') == 'false') {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $reset = Request::get('reset');
diff --git a/main/mySpace/course.php b/main/mySpace/course.php
index eba76eb79e..d26f2e1f26 100755
--- a/main/mySpace/course.php
+++ b/main/mySpace/course.php
@@ -35,8 +35,8 @@ if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"]))
 
 function count_courses()
 {
-	global $nb_courses;
-	return $nb_courses;
+    global $nb_courses;
+    return $nb_courses;
 }
 
 // Checking if the current coach is the admin coach
diff --git a/news_list.php b/news_list.php
index 498f2a050b..fa77ba849d 100755
--- a/news_list.php
+++ b/news_list.php
@@ -7,7 +7,7 @@ $tool_name = get_lang('SystemAnnouncements');
 
 $actions = '';
 if (api_is_platform_admin()) {
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
 }
 

From b069ca47f33f0dc2de1bda5b994068efe0c67146 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 15:00:36 +0100
Subject: [PATCH 42/68] Skip vendor libs

---
 .codeclimate.yml | 2 ++
 .scrutinizer.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index b3d42c2bfa..a4d115102b 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -55,6 +55,8 @@ exclude_paths:
 - main/template/
 - main/img/
 - main/lang/
+- plugin/buycourses/src/Culqi/
+- plugin/buycourses/src/Requests/
 - plugin/kannelsms/vendor/
 - plugin/clockworksms/vendor/
 - tests/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 6dce8ce8fc..fc165b713f 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -158,6 +158,8 @@ filter:
         - 'main/img/*'
         - 'main/lang/*'
         - 'main/default_course_document'
+        - 'plugin/buycourses/src/Culqi/*'
+        - 'plugin/buycourses/src/Requests/*'
         - 'plugin/kannelsms/vendor/*'
         - 'plugin/clockworksms/vendor/*'
         - 'tests/*'

From 25210681c8c8ffeb65cd1bdd22239436eae28b28 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 15:17:44 +0100
Subject: [PATCH 43/68] Format code, replace intval with (int), add log

---
 main/inc/lib/sessionmanager.lib.php     | 14 +++++++++---
 main/session/add_courses_to_session.php | 29 ++++++++++++-------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 906535c3f8..abdf741d48 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -2197,13 +2197,13 @@ class SessionManager
 
     /**
      * Subscribes courses to the given session and optionally (default)
-     * unsubscribes previous users
+     * unsubscribe previous users
      * @author Carlos Vargas from existing code
      * @param	int		$sessionId
      * @param	array	$courseList List of courses int ids
      * @param	bool	$removeExistingCoursesWithUsers Whether to unsubscribe
      * existing courses and users (true, default) or not (false)
-     * @param $copyEvaluation from base course to session course
+     * @param bool $copyEvaluation from base course to session course
      * @return	void	Nothing, or false on error
      * */
     public static function add_courses_to_session(
@@ -2307,7 +2307,12 @@ class SessionManager
                         }
                         $newCategoryIdList = [];
                         foreach ($cats as $cat) {
-                            $links = $cat->get_links(null, false, $courseInfo['code'], 0);
+                            $links = $cat->get_links(
+                                null,
+                                false,
+                                $courseInfo['code'],
+                                0
+                            );
 
                             $cat->set_session_id($sessionId);
                             $oldCategoryId= $cat->get_id();
@@ -4414,6 +4419,9 @@ class SessionManager
 
                 $deleteOnlyCourseCoaches = false;
                 if (count($courses) == 1) {
+                    if ($logger) {
+                        $logger->addInfo('Only one course delete old coach list');
+                    }
                     $deleteOnlyCourseCoaches = true;
                 }
 
diff --git a/main/session/add_courses_to_session.php b/main/session/add_courses_to_session.php
index bda8287fe7..5859ca149c 100644
--- a/main/session/add_courses_to_session.php
+++ b/main/session/add_courses_to_session.php
@@ -11,7 +11,7 @@ $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-$sessionId = isset($_GET['id_session']) ? intval($_GET['id_session']) : null;
+$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
 $add = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;
 
 SessionManager::protectSession($sessionId);
@@ -23,9 +23,11 @@ $xajax->registerFunction(array('search_courses', 'AddCourseToSession', 'search_c
 $this_section = SECTION_PLATFORM_ADMIN;
 
 // setting breadcrumbs
-//$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$sessionId, "name" => get_lang('SessionOverview'));
+$interbreadcrumb[] = array(
+    'url' => "resume_session.php?id_session=".$sessionId,
+    'name' => get_lang('SessionOverview')
+);
 
 // Database Table Definitions
 $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@@ -38,7 +40,7 @@ $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
 $tool_name= get_lang('SubscribeCoursesToSession');
 
 $add_type = 'multiple';
-if (isset($_GET['add_type']) && $_GET['add_type']!=''){
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -79,7 +81,6 @@ $CourseList = $SessionList = array();
 $courses = $sessions = array();
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
-
     $courseList = $_POST['SessionCoursesList'];
     $copyEvaluation = isset($_POST['copy_evaluation']);
 
@@ -123,24 +124,23 @@ echo '</div>';
 $ajax_search = $add_type == 'unique' ? true : false;
 $nosessionCourses = $sessionCourses = array();
 if ($ajax_search) {
-
-    $sql="SELECT course.id, code, title, visual_code, session_id
+    $sql = "SELECT course.id, code, title, visual_code, session_id
 			FROM $tbl_course course
 			INNER JOIN $tbl_session_rel_course session_rel_course
             ON
                 course.id = session_rel_course.c_id AND
-                session_rel_course.session_id = ".intval($sessionId)."
+                session_rel_course.session_id = ".$sessionId."
 			ORDER BY ".(sizeof($courses)?"(code IN(".implode(',', $courses).")) DESC,":"")." title";
 
     if (api_is_multiple_url_enabled()) {
         $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
         $access_url_id = api_get_current_access_url_id();
-        if ($access_url_id != -1){
+        if ($access_url_id != -1) {
             $sql = "SELECT course.id, code, title, visual_code, session_id
                     FROM $tbl_course course
                     INNER JOIN $tbl_session_rel_course session_rel_course
                         ON course.id = session_rel_course.c_id
-                        AND session_rel_course.session_id = ".intval($sessionId)."
+                        AND session_rel_course.session_id = ".$sessionId."
                         INNER JOIN $tbl_course_rel_access_url url_course
                         ON (url_course.c_id = course.id)
                     WHERE access_url_id = $access_url_id
@@ -150,9 +150,8 @@ if ($ajax_search) {
 
     $result = Database::query($sql);
     $Courses = Database::store_result($result);
-
     foreach ($Courses as $course) {
-        $sessionCourses[$course['id']] = $course ;
+        $sessionCourses[$course['id']] = $course;
     }
 } else {
     $sql = "SELECT course.id, code, title, visual_code, session_id
@@ -160,19 +159,19 @@ if ($ajax_search) {
 			LEFT JOIN $tbl_session_rel_course session_rel_course
             ON
                 course.id = session_rel_course.c_id AND
-                session_rel_course.session_id = ".intval($sessionId)."
+                session_rel_course.session_id = ".$sessionId."
 			ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
 
     if (api_is_multiple_url_enabled()) {
         $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
         $access_url_id = api_get_current_access_url_id();
-        if ($access_url_id != -1){
+        if ($access_url_id != -1) {
             $sql = "SELECT course.id, code, title, visual_code, session_id
                     FROM $tbl_course course
                     LEFT JOIN $tbl_session_rel_course session_rel_course
                     ON
                         course.id = session_rel_course.c_id AND
-                        session_rel_course.session_id = ".intval($sessionId)."
+                        session_rel_course.session_id = ".$sessionId."
                     INNER JOIN $tbl_course_rel_access_url url_course
                     ON (url_course.c_id = course.id)
                     WHERE access_url_id = $access_url_id

From 392d3b8b7cbff0b02dd8468f6a572e2c981fbc18 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 16 Mar 2017 15:54:16 +0100
Subject: [PATCH 44/68] Fix copy gradebook link and evaluations see BT#12466

---
 main/inc/lib/sessionmanager.lib.php | 107 +++++++++++++++++++++-------
 1 file changed, 81 insertions(+), 26 deletions(-)

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index abdf741d48..408627242d 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -81,7 +81,7 @@ class SessionManager
             'coach_access_end_date' => $session->getCoachAccessEndDate()
                 ? $session->getCoachAccessEndDate()->format('Y-m-d H:i:s')
                 : null,
-            'send_subscription_notification' => $session->getSendSubscriptionNotification()
+            'send_subscription_notification' => $session->getSendSubscriptionNotification(),
         ];
     }
 
@@ -199,7 +199,7 @@ class SessionManager
                     'visibility' => $visibility,
                     'description' => $description,
                     'show_description' => intval($showDescription),
-                    'send_subscription_notification' => (int) $sendSubscriptionNotification
+                    'send_subscription_notification' => (int) $sendSubscriptionNotification,
                 );
 
                 if (!empty($startDate)) {
@@ -1315,7 +1315,7 @@ class SessionManager
                 'clicks' => $info['counter'], //+ $clicks[$info['user_id']],
                 'ip' => '',
                 'timeLoggedIn' => gmdate("H:i:s", strtotime($info['logout_course_date']) - strtotime($info['login_course_date'])),
-                'session' => $session['name']
+                'session' => $session['name'],
             );
         }
 
@@ -1478,7 +1478,7 @@ class SessionManager
                     'display_start_date' => null,
                     'display_end_date' => null,
                     'coach_access_start_date' => null,
-                    'coach_access_end_date' => null
+                    'coach_access_end_date' => null,
                 ];
 
                 if (!empty($sessionAdminId)) {
@@ -1601,7 +1601,7 @@ class SessionManager
                 '*',
                 $tbl_student_publication,
                 [
-                    'where' => ['session_id = ? AND c_id = ?' => [$id_checked, $courseId]]
+                    'where' => ['session_id = ? AND c_id = ?' => [$id_checked, $courseId]],
                 ]
             );
 
@@ -2300,11 +2300,44 @@ class SessionManager
                 if ($copyEvaluation) {
                     $cats = Category::load(null, null, $courseInfo['code']);
                     if (!empty($cats)) {
+                        $sessionCategory = Category:: load(
+                            null,
+                            null,
+                            $courseInfo['code'],
+                            null,
+                            null,
+                            $sessionId,
+                            false
+                        );
+
+                        // @todo remove commented code
+                        if (empty($sessionCategory)) {
+                            // There is no category for this course+session, so create one
+                            $cat = new Category();
+                            $sessionName = api_get_session_name($sessionId);
+                            $cat->set_name($courseInfo['code'].' - '.get_lang('Session').' '.$sessionName);
+                            $cat->set_session_id($sessionId);
+                            $cat->set_course_code($courseInfo['code']);
+                            $cat->set_description(null);
+                            //$cat->set_user_id($stud_id);
+                            $cat->set_parent_id(0);
+                            $cat->set_weight(100);
+                            $cat->set_visible(0);
+                            $cat->set_certificate_min_score(75);
+                            $cat->add();
+                            $sessionGradeBookCategoryId = $cat->get_id();
+                        } else {
+                            if (!empty($sessionCategory[0])) {
+                                $sessionGradeBookCategoryId = $sessionCategory[0]->get_id();
+                            }
+                        }
+
                         $categoryIdList = [];
                         /** @var Category $cat */
                         foreach ($cats as $cat) {
                             $categoryIdList[$cat->get_id()] = $cat->get_id();
                         }
+
                         $newCategoryIdList = [];
                         foreach ($cats as $cat) {
                             $links = $cat->get_links(
@@ -2314,23 +2347,45 @@ class SessionManager
                                 0
                             );
 
-                            $cat->set_session_id($sessionId);
-                            $oldCategoryId= $cat->get_id();
-                            $newId = $cat->add();
-                            $newCategoryIdList[$oldCategoryId] = $newId;
-                            $parentId = $cat->get_parent_id();
+                            //$cat->set_session_id($sessionId);
+                            //$oldCategoryId = $cat->get_id();
+                            //$newId = $cat->add();
+                            //$newCategoryIdList[$oldCategoryId] = $newId;
+                            //$parentId = $cat->get_parent_id();
 
-                            if (!empty($parentId)) {
+                            /*if (!empty($parentId)) {
                                 $newParentId = $newCategoryIdList[$parentId];
                                 $cat->set_parent_id($newParentId);
                                 $cat->save();
+                            }*/
+
+                            if (!empty($links)) {
+                                /** @var AbstractLink $link */
+                                foreach ($links as $link) {
+                                    //$newCategoryId = $newCategoryIdList[$link->get_category_id()];
+                                    $link->set_category_id(
+                                        $sessionGradeBookCategoryId
+                                    );
+                                    $link->add();
+                                }
                             }
 
-                            /** @var AbstractLink $link */
-                            foreach ($links as $link) {
-                                $newCategoryId = $newCategoryIdList[$link->get_category_id()];
-                                $link->set_category_id($newCategoryId);
-                                $link->add();
+                            $evaluationList = $cat->get_evaluations(
+                                null,
+                                false,
+                                $courseInfo['code'],
+                                0
+                            );
+
+                            if (!empty($evaluationList)) {
+                                /** @var Evaluation $evaluation */
+                                foreach ($evaluationList as $evaluation) {
+                                    //$evaluationId = $newCategoryIdList[$evaluation->get_category_id()];
+                                    $evaluation->set_category_id(
+                                        $sessionGradeBookCategoryId
+                                    );
+                                    $evaluation->add();
+                                }
                             }
                         }
 
@@ -2590,7 +2645,7 @@ class SessionManager
         $params = [
             'name' => $name,
             'date_start' => $date_start,
-            'access_url_id' => $access_url_id
+            'access_url_id' => $access_url_id,
         ];
 
         if (!empty($date_end)) {
@@ -2774,7 +2829,7 @@ class SessionManager
         $availableFields = array(
             's.id',
             's.name',
-            'c.id'
+            'c.id',
         );
 
         $availableOperator = array(
@@ -3047,7 +3102,7 @@ class SessionManager
             DRH,
             SESSIONADMIN,
             PLATFORM_ADMIN,
-            COURSE_TUTOR
+            COURSE_TUTOR,
         );
         $isAdmin = api_is_platform_admin_by_id($userInfo['user_id']);
         if (!$isAdmin && !in_array($userInfo['status'], $rolesAllowed)) {
@@ -4554,7 +4609,7 @@ class SessionManager
                             'display_start_date' => $dateStart,
                             'display_end_date' => $dateEnd,
                             'visibility' => $visibilityAfterExpirationPerSession,
-                            'session_category_id' => $session_category_id
+                            'session_category_id' => $session_category_id,
                         );
 
                         if (!empty($sessionDescription)) {
@@ -6386,7 +6441,7 @@ class SessionManager
 
         return $scuRepo->findBy([
             'user' => $coachId,
-            'status' => SessionRelCourseRelUser::STATUS_COURSE_COACH
+            'status' => SessionRelCourseRelUser::STATUS_COURSE_COACH,
         ]);
     }
 
@@ -7026,7 +7081,7 @@ class SessionManager
         $result = [
             'access' => $accessDates,
             'display' => $displayDates,
-            'coach' => $coachDates
+            'coach' => $coachDates,
         ];
 
         return $result;
@@ -7051,7 +7106,7 @@ class SessionManager
         $userInfo = api_get_user_info();
 
         $categoriesOptions = array(
-            '0' => get_lang('None')
+            '0' => get_lang('None'),
         );
 
         if ($categoriesList != false) {
@@ -7186,12 +7241,12 @@ class SessionManager
 
         $options = [
             0 => get_lang('ByDuration'),
-            1 => get_lang('ByDates')
+            1 => get_lang('ByDates'),
         ];
 
         $form->addSelect('access', get_lang('Access'), $options, array(
             'onchange' => 'accessSwitcher()',
-            'id' => 'access'
+            'id' => 'access',
         ));
 
         $form->addHtml('<div id="duration" style="display:none">');
@@ -7287,7 +7342,7 @@ class SessionManager
             'send_subscription_notification',
             [
                 get_lang('SendSubscriptionNotification'),
-                get_lang('SendAnEmailWhenAUserBeingSubscribed')
+                get_lang('SendAnEmailWhenAUserBeingSubscribed'),
             ]
         );
 

From 19b609a055f46a2d96fb346d5f0ebb42460f727b Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 16 Mar 2017 16:27:21 -0500
Subject: [PATCH 45/68] Avoid overflow when drop down menu being aligned to the
 right

---
 main/inc/lib/display.lib.php | 8 ++++++--
 main/lp/learnpath.class.php  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 45b11f8805..3f6a6cf56f 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -2032,14 +2032,18 @@ class Display
 
     /**
      * @todo use twig
+     * @param string $title
+     * @param array $elements
+     * @param bool $alignToRight
+     * @return string
      */
-    public static function groupButtonWithDropDown($title, $elements)
+    public static function groupButtonWithDropDown($title, $elements, $alignToRight = false)
     {
         $html = '<div class="btn-group">
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 '.$title.'
                 <span class="caret"></span></button>
-                <ul class="dropdown-menu">';
+                <ul class="dropdown-menu ' . ($alignToRight ? 'dropdown-menu-right' : '') . '">';
         foreach ($elements as $item) {
             $html .= Display::tag('li', Display::url($item['title'], $item['href']));
         }
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index 6c585491be..89c919fc70 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -5929,7 +5929,7 @@ class learnpath
                     ])
                 ),
             );
-            $actionsRight = Display::groupButtonWithDropDown(get_lang('PrerequisitesOptions'), $buttons);
+            $actionsRight = Display::groupButtonWithDropDown(get_lang('PrerequisitesOptions'), $buttons, true);
         }
 
         $toolbar = Display::toolbarAction('actions-lp-controller', array($actionsLeft, $actionsRight));

From af1627ceb186154a61b881610443d87674f4e75d Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 08:38:32 +0100
Subject: [PATCH 46/68] Format code, replace "die" with "return false", fix
 variable name.

---
 main/gradebook/lib/be/category.class.php      |    6 +-
 main/gradebook/lib/be/evaluation.class.php    | 1516 +++++++++--------
 .../lib/be/forumthreadlink.class.php          |  470 ++---
 3 files changed, 999 insertions(+), 993 deletions(-)

diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php
index a55cb5694b..71493070e0 100755
--- a/main/gradebook/lib/be/category.class.php
+++ b/main/gradebook/lib/be/category.class.php
@@ -1052,7 +1052,7 @@ class Category implements GradebookItem
                     if ($session_id) {
                         $link->set_session_id($session_id);
                     }
-	                
+
                     $linkres = $link->calc_score($stud_id, $type);
                     if (!empty($linkres) && $link->get_weight() != 0) {
                         $students[$stud_id] = $linkres[0];
@@ -1825,9 +1825,9 @@ class Category implements GradebookItem
                 WHERE parent_id = '.intval($catId);
 
         $result = Database::query($sql);
-        $allcats = Category::create_category_objects_from_sql_result($result);
+        $categories = Category::create_category_objects_from_sql_result($result);
 
-        return $allcats;
+        return $categories;
     }
 
     /**
diff --git a/main/gradebook/lib/be/evaluation.class.php b/main/gradebook/lib/be/evaluation.class.php
index 0325858998..c8e8ce721e 100755
--- a/main/gradebook/lib/be/evaluation.class.php
+++ b/main/gradebook/lib/be/evaluation.class.php
@@ -9,365 +9,366 @@ use ChamiloSession as Session;
  */
 class Evaluation implements GradebookItem
 {
-	private $id;
-	private $name;
-	private $description;
-	private $user_id;
-	private $course_code;
-	/** @var Category */
-	private $category;
-	private $created_at;
-	private $weight;
-	private $eval_max;
-	private $visible;
-	private $sessionId;
-	public $studentList;
-
-	/**
-	 * Construct
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @return Category
-	 */
-	public function getCategory()
-	{
-		return $this->category;
-	}
-
-	/**
-	 * @param Category $category
-	 */
-	public function setCategory($category)
-	{
-		$this->category = $category;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_category_id()
-	{
-		return $this->category->get_id();
-	}
-
-	/**
-	 * @param int $category_id
-	 */
-	public function set_category_id($category_id)
-	{
-		$categories = Category::load($category_id);
-		if (isset($categories[0])) {
-			$this->setCategory($categories[0]);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_id()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return $this->description;
-	}
-
-	public function get_user_id()
-	{
-		return $this->user_id;
-	}
-
-	public function get_course_code()
-	{
-		return $this->course_code;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSessionId()
-	{
-		return $this->sessionId;
-	}
-
-	/**
-	 * @param int $sessionId
-	 */
-	public function setSessionId($sessionId)
-	{
-		$this->sessionId = intval($sessionId);
-	}
-
-	public function get_date()
-	{
-		return $this->created_at;
-	}
-
-	public function get_weight()
-	{
-		return $this->weight;
-	}
-
-	public function get_max()
-	{
-		return $this->eval_max;
-	}
-
-	public function get_type()
-	{
-		return $this->type;
-	}
-
-	public function is_visible()
-	{
-		return $this->visible;
-	}
-
-	public function get_locked()
-	{
-		return $this->locked;
-	}
-
-	public function is_locked()
-	{
-		return isset($this->locked) && $this->locked == 1 ? true : false;
-	}
-
-	public function set_id($id)
-	{
-		$this->id = $id;
-	}
-
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	public function set_description($description)
-	{
-		$this->description = $description;
-	}
-
-	public function set_user_id($user_id)
-	{
-		$this->user_id = $user_id;
-	}
-
-	public function set_course_code($course_code)
-	{
-		$this->course_code = $course_code;
-	}
-
-	public function set_date($date)
-	{
-		$this->created_at = $date;
-	}
-
-	public function set_weight($weight)
-	{
-		$this->weight = $weight;
-	}
-
-	public function set_max($max)
-	{
-		$this->eval_max = $max;
-	}
-
-	public function set_visible($visible)
-	{
-		$this->visible = $visible;
-	}
-
-	public function set_type($type)
-	{
-		$this->type = $type;
-	}
-
-	public function set_locked($locked)
-	{
-		$this->locked = $locked;
-	}
-
-	/**
-	 * Retrieve evaluations and return them as an array of Evaluation objects
-	 * @param int $id evaluation id
-	 * @param int $user_id user id (evaluation owner)
-	 * @param string $course_code course code
-	 * @param int $category_id parent category
-	 * @param integer $visible visible
-	 */
-	public static function load(
-		$id = null,
-		$user_id = null,
-		$course_code = null,
-		$category_id = null,
-		$visible = null,
-		$locked = null
-	) {
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations;
-		$paramcount = 0;
-
-		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
-		}
-
-		if (isset($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
-		}
-
-		if (isset($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
-		}
-
-		if (isset($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
-		}
-
-		if (isset($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
-		}
-
-		if (isset($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' locked = '.intval($locked);
-		}
-
-		$result = Database::query($sql);
-		$allEval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $allEval;
-	}
-
-	/**
-	 * @param array $result
-	 * @return array
-	 */
-	private static function create_evaluation_objects_from_sql_result($result)
-	{
-		$alleval = array();
-		if (Database::num_rows($result)) {
-			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
-				$eval->set_id($data['id']);
-				$eval->set_name($data['name']);
-				$eval->set_description($data['description']);
-				$eval->set_user_id($data['user_id']);
-				$eval->set_course_code($data['course_code']);
-				$eval->set_category_id($data['category_id']);
-				$eval->set_date(api_get_local_time($data['created_at']));
-				$eval->set_weight($data['weight']);
-				$eval->set_max($data['max']);
-				$eval->set_visible($data['visible']);
-				$eval->set_type($data['type']);
-				$eval->set_locked($data['locked']);
-				$eval->setSessionId(api_get_session_id());
-
-				$alleval[] = $eval;
-			}
-		}
-
-		return $alleval;
-	}
-
-	/**
-	 * Insert this evaluation into the database
-	 */
+    private $id;
+    private $name;
+    private $description;
+    private $user_id;
+    private $course_code;
+    /** @var Category */
+    private $category;
+    private $created_at;
+    private $weight;
+    private $eval_max;
+    private $visible;
+    private $sessionId;
+    public $studentList;
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param Category $category
+     */
+    public function setCategory($category)
+    {
+        $this->category = $category;
+    }
+
+    /**
+     * @return int
+     */
+    public function get_category_id()
+    {
+        return $this->category->get_id();
+    }
+
+    /**
+     * @param int $category_id
+     */
+    public function set_category_id($category_id)
+    {
+        $categories = Category::load($category_id);
+        if (isset($categories[0])) {
+            $this->setCategory($categories[0]);
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return $this->description;
+    }
+
+    public function get_user_id()
+    {
+        return $this->user_id;
+    }
+
+    public function get_course_code()
+    {
+        return $this->course_code;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSessionId()
+    {
+        return $this->sessionId;
+    }
+
+    /**
+     * @param int $sessionId
+     */
+    public function setSessionId($sessionId)
+    {
+        $this->sessionId = intval($sessionId);
+    }
+
+    public function get_date()
+    {
+        return $this->created_at;
+    }
+
+    public function get_weight()
+    {
+        return $this->weight;
+    }
+
+    public function get_max()
+    {
+        return $this->eval_max;
+    }
+
+    public function get_type()
+    {
+        return $this->type;
+    }
+
+    public function is_visible()
+    {
+        return $this->visible;
+    }
+
+    public function get_locked()
+    {
+        return $this->locked;
+    }
+
+    public function is_locked()
+    {
+        return isset($this->locked) && $this->locked == 1 ? true : false;
+    }
+
+    public function set_id($id)
+    {
+        $this->id = $id;
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_description($description)
+    {
+        $this->description = $description;
+    }
+
+    public function set_user_id($user_id)
+    {
+        $this->user_id = $user_id;
+    }
+
+    public function set_course_code($course_code)
+    {
+        $this->course_code = $course_code;
+    }
+
+    public function set_date($date)
+    {
+        $this->created_at = $date;
+    }
+
+    public function set_weight($weight)
+    {
+        $this->weight = $weight;
+    }
+
+    public function set_max($max)
+    {
+        $this->eval_max = $max;
+    }
+
+    public function set_visible($visible)
+    {
+        $this->visible = $visible;
+    }
+
+    public function set_type($type)
+    {
+        $this->type = $type;
+    }
+
+    public function set_locked($locked)
+    {
+        $this->locked = $locked;
+    }
+
+    /**
+     * Retrieve evaluations and return them as an array of Evaluation objects
+     * @param int $id evaluation id
+     * @param int $user_id user id (evaluation owner)
+     * @param string $course_code course code
+     * @param int $category_id parent category
+     * @param integer $visible visible
+     */
+    public static function load(
+        $id = null,
+        $user_id = null,
+        $course_code = null,
+        $category_id = null,
+        $visible = null,
+        $locked = null
+    ) {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations;
+        $paramcount = 0;
+
+        if (isset ($id)) {
+            $sql.= ' WHERE id = '.intval($id);
+            $paramcount ++;
+        }
+
+        if (isset($user_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' user_id = '.intval($user_id);
+            $paramcount ++;
+        }
+
+        if (isset($course_code) && $course_code <> '-1') {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= " course_code = '".Database::escape_string($course_code)."'";
+            $paramcount ++;
+        }
+
+        if (isset($category_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' category_id = '.intval($category_id);
+            $paramcount ++;
+        }
+
+        if (isset($visible)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' visible = '.intval($visible);
+            $paramcount ++;
+        }
+
+        if (isset($locked)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' locked = '.intval($locked);
+        }
+
+        $result = Database::query($sql);
+        $allEval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $allEval;
+    }
+
+    /**
+     * @param array $result
+     * @return array
+     */
+    private static function create_evaluation_objects_from_sql_result($result)
+    {
+        $alleval = array();
+        if (Database::num_rows($result)) {
+            while ($data = Database::fetch_array($result)) {
+                $eval= new Evaluation();
+                $eval->set_id($data['id']);
+                $eval->set_name($data['name']);
+                $eval->set_description($data['description']);
+                $eval->set_user_id($data['user_id']);
+                $eval->set_course_code($data['course_code']);
+                $eval->set_category_id($data['category_id']);
+                $eval->set_date(api_get_local_time($data['created_at']));
+                $eval->set_weight($data['weight']);
+                $eval->set_max($data['max']);
+                $eval->set_visible($data['visible']);
+                $eval->set_type($data['type']);
+                $eval->set_locked($data['locked']);
+                $eval->setSessionId(api_get_session_id());
+
+                $alleval[] = $eval;
+            }
+        }
+
+        return $alleval;
+    }
+
+    /**
+     * Insert this evaluation into the database
+     */
     public function add()
-	{
-		if (isset($this->name) &&
-			isset($this->user_id) &&
-			isset($this->weight) &&
-			isset ($this->eval_max) &&
-			isset($this->visible)
-		) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-
-			$sql = 'INSERT INTO '.$tbl_grade_evaluations
-				.' (name, user_id, weight, max, visible';
-			if (isset($this->description)) {
-				$sql .= ',description';
-			}
-			if (isset($this->course_code)) {
-				$sql .= ', course_code';
-			}
-			if (isset($this->category)) {
-				$sql .= ', category_id';
-			}
-			$sql .= ', created_at';
-			$sql .= ',type';
-			$sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
-				.','.intval($this->get_user_id())
-				.','.api_float_val($this->get_weight())
-				.','.intval($this->get_max())
-				.','.intval($this->is_visible());
-			if (isset($this->description)) {
-				$sql .= ",'".Database::escape_string($this->get_description())."'";
-			}
-			if (isset($this->course_code)) {
-				$sql .= ",'".Database::escape_string($this->get_course_code())."'";
-			}
-			if (isset($this->category)) {
-				$sql .= ','.intval($this->get_category_id());
-			}
-			if (empty($this->type)) {
-				$this->type = 'evaluation';
-			}
-			$sql .= ", '".api_get_utc_datetime()."'";
-			$sql .= ',\''.Database::escape_string($this->type).'\'';
-			$sql .= ")";
-
-			Database::query($sql);
-			$this->set_id(Database::insert_id());
-		} else {
-			die('Error in Evaluation add: required field empty');
-		}
-	}
-
-	/**
-	 * @param int $idevaluation
-	 */
-	public function add_evaluation_log($idevaluation)
-	{
-		if (!empty($idevaluation)) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
-			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
-			$arreval = get_object_vars($dateobject[0]);
-			if (!empty($arreval['id'])) {
-				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
+    {
+        if (isset($this->name) &&
+            isset($this->user_id) &&
+            isset($this->weight) &&
+            isset($this->eval_max) &&
+            isset($this->visible)
+        ) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+
+            $sql = 'INSERT INTO '.$tbl_grade_evaluations
+                .' (name, user_id, weight, max, visible';
+            if (isset($this->description)) {
+                $sql .= ',description';
+            }
+            if (isset($this->course_code)) {
+                $sql .= ', course_code';
+            }
+            if (isset($this->category)) {
+                $sql .= ', category_id';
+            }
+            $sql .= ', created_at';
+            $sql .= ',type';
+            $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
+                .','.intval($this->get_user_id())
+                .','.api_float_val($this->get_weight())
+                .','.intval($this->get_max())
+                .','.intval($this->is_visible());
+            if (isset($this->description)) {
+                $sql .= ",'".Database::escape_string($this->get_description())."'";
+            }
+            if (isset($this->course_code)) {
+                $sql .= ",'".Database::escape_string($this->get_course_code())."'";
+            }
+            if (isset($this->category)) {
+                $sql .= ','.intval($this->get_category_id());
+            }
+            if (empty($this->type)) {
+                $this->type = 'evaluation';
+            }
+            $sql .= ", '".api_get_utc_datetime()."'";
+            $sql .= ',\''.Database::escape_string($this->type).'\'';
+            $sql .= ")";
+
+            Database::query($sql);
+            $this->set_id(Database::insert_id());
+        } else {
+            return false;
+            //die('Error in Evaluation add: required field empty');
+        }
+    }
+
+    /**
+     * @param int $idevaluation
+     */
+    public function add_evaluation_log($idevaluation)
+    {
+        if (!empty($idevaluation)) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+            $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
+            $eval = new Evaluation();
+            $dateobject = $eval->load($idevaluation,null,null,null,null);
+            $arreval = get_object_vars($dateobject[0]);
+            if (!empty($arreval['id'])) {
+                $sql = 'SELECT weight from '.$tbl_grade_evaluations.'
                         WHERE id='.$arreval['id'];
                 $rs = Database::query($sql);
                 $row_old_weight = Database::fetch_array($rs, 'ASSOC');
@@ -383,426 +384,427 @@ class Evaluation implements GradebookItem
                     'user_id_log' => api_get_user_id()
                 ];
                 Database::insert($tbl_grade_linkeval_log, $params);
-			}
-		}
-	}
-
-	/**
-	 * Update the properties of this evaluation in the database
-	 */
-	public function save()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'UPDATE '.$tbl_grade_evaluations
-			." SET name = '".Database::escape_string($this->get_name())."'"
-			.', description = ';
-		if (isset($this->description)) {
-			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
-			$sql .= 'null';
-		}
-		$sql .= ', user_id = '.intval($this->get_user_id())
-			.', course_code = ';
-		if (isset($this->course_code)) {
-			$sql .= "'".Database::escape_string($this->get_course_code())."'";
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', category_id = ';
-		if (isset($this->category)) {
-			$sql .= intval($this->get_category_id());
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
-			.', max = '.intval($this->get_max())
-			.', visible = '.intval($this->is_visible())
-			.' WHERE id = '.intval($this->id);
-		//recorded history
-
-		$eval_log = new Evaluation();
-		$eval_log->add_evaluation_log($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation from the database
-	 */
-	public function delete()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Check if an evaluation name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 */
-	public function does_name_exist($name, $parent)
-	{
-		if (!isset ($name)) {
-			$name = $this->name;
-			$parent = $this->category;
-		}
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT count(id) AS number'
-			.' FROM '.$tbl_grade_evaluations
-			." WHERE name = '".Database::escape_string($name)."'";
-
-		if (api_is_allowed_to_edit()) {
-			$parent = Category::load($parent);
-			$code = $parent[0]->get_course_code();
-			$courseInfo = api_get_course_info($code);
-			$courseId = $courseInfo['real_id'];
-
-			if (isset($code) && $code != '0') {
-				$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-				$sql .= ' AND user_id IN (
-					 SELECT user_id FROM '.$main_course_user_table.'
-					 WHERE
-						c_id = '.$courseId.' AND
-						status = '.COURSEMANAGER.'
-					)';
-			} else {
-				$sql .= ' AND user_id = '.api_get_user_id();
-			}
-
-		}else {
-			$sql .= ' AND user_id = '.api_get_user_id();
-		}
-
-		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
-		} else {
-			$sql.= ' AND category_id = '.intval($parent);
-		}
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return $number[0] != 0;
-	}
-
-	/**
-	 * Are there any results for this evaluation yet ?
-	 * The 'max' property should not be changed then.
-	 */
-	public function has_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'SELECT count(id) AS number
-				FROM '.$tbl_grade_results.'
-				WHERE evaluation_id = '.intval($this->id);
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Delete all results for this evaluation
-	 */
-	public function delete_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'DELETE FROM '.$tbl_grade_results.'
-				WHERE evaluation_id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation and all underlying results.
-	 */
-	public function delete_with_results()
-	{
-		$this->delete_results();
-		$this->delete();
-	}
-
-	/**
-	 * Check if the given score is possible for this evaluation
-	 */
-	public function is_valid_score($score)
-	{
-		return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
-	}
-
-	/**
-	 * Calculate the score of this evaluation
-	 * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
-	 * @param string $type (best, average, ranking)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
+            }
+        }
+    }
+
+    /**
+     * Update the properties of this evaluation in the database
+     */
+    public function save()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'UPDATE '.$tbl_grade_evaluations
+            ." SET name = '".Database::escape_string($this->get_name())."'"
+            .', description = ';
+        if (isset($this->description)) {
+            $sql .= "'".Database::escape_string($this->get_description())."'";
+        }else {
+            $sql .= 'null';
+        }
+        $sql .= ', user_id = '.intval($this->get_user_id())
+            .', course_code = ';
+        if (isset($this->course_code)) {
+            $sql .= "'".Database::escape_string($this->get_course_code())."'";
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', category_id = ';
+        if (isset($this->category)) {
+            $sql .= intval($this->get_category_id());
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
+            .', max = '.intval($this->get_max())
+            .', visible = '.intval($this->is_visible())
+            .' WHERE id = '.intval($this->id);
+        //recorded history
+
+        $eval_log = new Evaluation();
+        $eval_log->add_evaluation_log($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation from the database
+     */
+    public function delete()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Check if an evaluation name (with the same parent category) already exists
+     * @param $name name to check (if not given, the name property of this object will be checked)
+     * @param $parent parent category
+     */
+    public function does_name_exist($name, $parent)
+    {
+        if (!isset($name)) {
+            $name = $this->name;
+            $parent = $this->category;
+        }
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT count(id) AS number'
+            .' FROM '.$tbl_grade_evaluations
+            ." WHERE name = '".Database::escape_string($name)."'";
+
+        if (api_is_allowed_to_edit()) {
+            $parent = Category::load($parent);
+            $code = $parent[0]->get_course_code();
+            $courseInfo = api_get_course_info($code);
+            $courseId = $courseInfo['real_id'];
+
+            if (isset($code) && $code != '0') {
+                $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+                $sql .= ' AND user_id IN (
+                     SELECT user_id FROM '.$main_course_user_table.'
+                     WHERE
+                        c_id = '.$courseId.' AND
+                        status = '.COURSEMANAGER.'
+                    )';
+            } else {
+                $sql .= ' AND user_id = '.api_get_user_id();
+            }
+        } else {
+            $sql .= ' AND user_id = '.api_get_user_id();
+        }
+
+        if (!isset($parent)) {
+            $sql.= ' AND category_id is null';
+        } else {
+            $sql.= ' AND category_id = '.intval($parent);
+        }
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return $number[0] != 0;
+    }
+
+    /**
+     * Are there any results for this evaluation yet ?
+     * The 'max' property should not be changed then.
+     */
+    public function has_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'SELECT count(id) AS number
+                FROM '.$tbl_grade_results.'
+                WHERE evaluation_id = '.intval($this->id);
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Delete all results for this evaluation
+     */
+    public function delete_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'DELETE FROM '.$tbl_grade_results.'
+                WHERE evaluation_id = '.intval($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation and all underlying results.
+     */
+    public function delete_with_results()
+    {
+        $this->delete_results();
+        $this->delete();
+    }
+
+    /**
+     * Check if the given score is possible for this evaluation
+     */
+    public function is_valid_score($score)
+    {
+        return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
+    }
+
+    /**
+     * Calculate the score of this evaluation
+     * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
+     * @param string $type (best, average, ranking)
+     * @return	array (score, max) if student is given
+     * 			array (sum of scores, number of scores) otherwise
+     * 			or null if no scores available
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
         $useSession = true;
-		if (isset($stud_id) && empty($type)) {
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
-			$data = Session::read('calc_score');
+        if (isset($stud_id) && empty($type)) {
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
+            $data = Session::read('calc_score');
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
                 $results  = null;
             }
-			if (empty($results)) {
-				$results = Result::load(null, $stud_id, $this->id);
-				Session::write('calc_score', array($key => $results));
-			}
-
-			$score = 0;
-			/** @var Result $res */
-			foreach ($results as $res) {
-				$score = $res->get_score();
-			}
-
-			return array($score, $this->get_max());
-		} else {
-
-			$count = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
+            if (empty($results)) {
+                $results = Result::load(null, $stud_id, $this->id);
+                Session::write('calc_score', array($key => $results));
+            }
+
+            $score = 0;
+            /** @var Result $res */
+            foreach ($results as $res) {
+                $score = $res->get_score();
+            }
+
+            return array($score, $this->get_max());
+        } else {
+
+            $count = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
                 $allResults  = null;
             }
-			if (empty($allResults)) {
-				$allResults = Result::load(null, null, $this->id);
-				Session::write($key, $allResults);
-			}
-
-			$students = array();
-			/** @var Result $res */
-			foreach ($allResults as $res) {
-				$score = $res->get_score();
-				if (!empty($score) || $score == '0') {
-					$count++;
-					$sum += $score / $this->get_max();
-					$sumResult += $score;
-					if ($score > $bestResult) {
-						$bestResult = $score;
-					}
-					$weight = $this->get_max();
-				}
-				$students[$res->get_user_id()] = $score;
-			}
-
-			if (empty($count)) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $weight);
-					break;
-				case 'average':
-					return array($sumResult/$count, $weight);
-					break;
-				case 'ranking':
+            if (empty($allResults)) {
+                $allResults = Result::load(null, null, $this->id);
+                Session::write($key, $allResults);
+            }
+
+            $students = array();
+            /** @var Result $res */
+            foreach ($allResults as $res) {
+                $score = $res->get_score();
+                if (!empty($score) || $score == '0') {
+                    $count++;
+                    $sum += $score / $this->get_max();
+                    $sumResult += $score;
+                    if ($score > $bestResult) {
+                        $bestResult = $score;
+                    }
+                    $weight = $this->get_max();
+                }
+                $students[$res->get_user_id()] = $score;
+            }
+
+            if (empty($count)) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $weight);
+                    break;
+                case 'average':
+                    return array($sumResult/$count, $weight);
+                    break;
+                case 'ranking':
                     $students = array();
                     /** @var Result $res */
                     foreach ($allResults as $res) {
                         $score = $res->get_score();
                         $students[$res->get_user_id()] = $score;
                     }
-					return AbstractLink::getCurrentUserRanking($stud_id, $students);
-					break;
-				default:
-					return array($sum, $count);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Generate an array of possible categories where this evaluation can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-	public function get_target_categories()
-	{
-		// - course independent evaluation
-		//   -> movable to root or other course independent categories
-		// - evaluation inside a course
-		//   -> movable to root, independent categories or categories inside the course
-		$user = (api_is_platform_admin() ? null : api_get_user_id());
-		$targets = array();
-		$level = 0;
-
-		$root = array(0, get_lang('RootCat'), $level);
-		$targets[] = $root;
-
-		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
-			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-			}
-		}
-
-		$indcats = Category::load(null,$user,0,0);
-		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-
-		return $targets;
-	}
-
-	/**
-	 * Internal function used by get_target_categories()
-	 * @param integer $level
-	 */
-	private function add_target_subcategories($targets, $level, $catid)
-	{
-		$subcats = Category::load(null,null,null,$catid);
-		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-		return $targets;
-	}
-
-	/**
-	 * Move this evaluation to the given category.
-	 * If this evaluation moves from inside a course to outside,
-	 * its course code is also changed.
-	 */
-	public function move_to_cat($cat)
-	{
-		$this->set_category_id($cat->get_id());
-		if ($this->get_course_code() != $cat->get_course_code()) {
-			$this->set_course_code($cat->get_course_code());
-		}
-		$this->save();
-	}
-
-	/**
-	 * Retrieve evaluations where a student has results for
-	 * and return them as an array of Evaluation objects
-	 * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
-	 * @param int $stud_id student id
-	 */
-	public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
-				WHERE id IN (
-					SELECT evaluation_id FROM '.$tbl_grade_results.'
-					WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL
-				)';
-		if (!api_is_allowed_to_edit()) {
-			$sql .= ' AND visible = 1';
-		}
-		if (isset($cat_id)) {
-			$sql .= ' AND category_id = '.intval($cat_id);
-		} else {
-			$sql .= ' AND category_id >= 0';
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-	/**
-	 * Get a list of students that do not have a result record for this evaluation
-	 */
-	public function get_not_subscribed_students($first_letter_user = '')
-	{
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
-			." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
-			.' AND status = '.STUDENT
-			.' AND user_id NOT IN'
-			.' (SELECT user_id FROM '.$tbl_grade_results
-			.' WHERE evaluation_id = '.intval($this->id)
-			.' )'
-			.' ORDER BY lastname';
-
-		$result = Database::query($sql);
-		$users = Database::store_result($result);
-
-		return $users;
-	}
-
-	/**
-	 * Find evaluations by name
-	 * @param string $name_mask search string
-	 * @return array evaluation objects matching the search criterium
-	 * @todo can be written more efficiently using a new (but very complex) sql query
-	 */
-	public function find_evaluations($name_mask,$selectcat)
-	{
-		$rootcat = Category::load($selectcat);
-		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
-		$foundevals = array();
-		foreach ($evals as $eval) {
-			if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
-				$foundevals[] = $eval;
-			}
-		}
-		return $foundevals;
-	}
-
-	public function get_item_type()
-	{
-		return 'E';
-	}
-
-	public function get_icon_name()
-	{
-		return $this->has_results() ? 'evalnotempty' : 'evalempty';
-	}
-
-	/**
-	 * Locks an evaluation, only one who can unlock it is the platform administrator.
-	 * @param int locked 1 or unlocked 0
-	 *
-	 **/
-	function lock($locked)
-	{
-		$table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
-		Database::query($sql);
-	}
-
-	function check_lock_permissions()
-	{
-		if (api_is_platform_admin()) {
-			return true;
-		} else {
-			if ($this->is_locked()) {
-				api_not_allowed();
-			}
-		}
-	}
-
-	function delete_linked_data()
-	{
-
-	}
+                    return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                    break;
+                default:
+                    return array($sum, $count);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Generate an array of possible categories where this evaluation can be moved to.
+     * Notice: its own parent will be included in the list: it's up to the frontend
+     * to disable this element.
+     * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
+     */
+    public function get_target_categories()
+    {
+        // - course independent evaluation
+        //   -> movable to root or other course independent categories
+        // - evaluation inside a course
+        //   -> movable to root, independent categories or categories inside the course
+        $user = (api_is_platform_admin() ? null : api_get_user_id());
+        $targets = array();
+        $level = 0;
+
+        $root = array(0, get_lang('RootCat'), $level);
+        $targets[] = $root;
+
+        if (isset($this->course_code) && !empty($this->course_code)) {
+            $crscats = Category::load(null,null,$this->course_code,0);
+            foreach ($crscats as $cat) {
+                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            }
+        }
+
+        $indcats = Category::load(null,$user,0,0);
+        foreach ($indcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+
+        return $targets;
+    }
+
+    /**
+     * Internal function used by get_target_categories()
+     * @param integer $level
+     *
+     * @return array
+     */
+    private function add_target_subcategories($targets, $level, $catid)
+    {
+        $subcats = Category::load(null,null,null,$catid);
+        foreach ($subcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+        return $targets;
+    }
+
+    /**
+     * Move this evaluation to the given category.
+     * If this evaluation moves from inside a course to outside,
+     * its course code is also changed.
+     */
+    public function move_to_cat($cat)
+    {
+        $this->set_category_id($cat->get_id());
+        if ($this->get_course_code() != $cat->get_course_code()) {
+            $this->set_course_code($cat->get_course_code());
+        }
+        $this->save();
+    }
+
+    /**
+     * Retrieve evaluations where a student has results for
+     * and return them as an array of Evaluation objects
+     * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
+     * @param int $stud_id student id
+     */
+    public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
+                WHERE id IN (
+                    SELECT evaluation_id FROM '.$tbl_grade_results.'
+                    WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL
+                )';
+        if (!api_is_allowed_to_edit()) {
+            $sql .= ' AND visible = 1';
+        }
+        if (isset($cat_id)) {
+            $sql .= ' AND category_id = '.intval($cat_id);
+        } else {
+            $sql .= ' AND category_id >= 0';
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+    /**
+     * Get a list of students that do not have a result record for this evaluation
+     */
+    public function get_not_subscribed_students($first_letter_user = '')
+    {
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
+            ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
+            .' AND status = '.STUDENT
+            .' AND user_id NOT IN'
+            .' (SELECT user_id FROM '.$tbl_grade_results
+            .' WHERE evaluation_id = '.intval($this->id)
+            .' )'
+            .' ORDER BY lastname';
+
+        $result = Database::query($sql);
+        $users = Database::store_result($result);
+
+        return $users;
+    }
+
+    /**
+     * Find evaluations by name
+     * @param string $name_mask search string
+     * @return array evaluation objects matching the search criterium
+     * @todo can be written more efficiently using a new (but very complex) sql query
+     */
+    public function find_evaluations($name_mask,$selectcat)
+    {
+        $rootcat = Category::load($selectcat);
+        $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
+        $foundevals = array();
+        foreach ($evals as $eval) {
+            if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
+                $foundevals[] = $eval;
+            }
+        }
+        return $foundevals;
+    }
+
+    public function get_item_type()
+    {
+        return 'E';
+    }
+
+    public function get_icon_name()
+    {
+        return $this->has_results() ? 'evalnotempty' : 'evalempty';
+    }
+
+    /**
+     * Locks an evaluation, only one who can unlock it is the platform administrator.
+     * @param int locked 1 or unlocked 0
+     *
+     **/
+    function lock($locked)
+    {
+        $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
+        Database::query($sql);
+    }
+
+    function check_lock_permissions()
+    {
+        if (api_is_platform_admin()) {
+            return true;
+        } else {
+            if ($this->is_locked()) {
+                api_not_allowed();
+            }
+        }
+    }
+
+    function delete_linked_data()
+    {
+
+    }
 
     public function getStudentList()
     {
         return $this->studentList;
     }
 
-	public function setStudentList($list)
-	{
-		$this->studentList = $list;
-	}
+    public function setStudentList($list)
+    {
+        $this->studentList = $list;
+    }
 }
diff --git a/main/gradebook/lib/be/forumthreadlink.class.php b/main/gradebook/lib/be/forumthreadlink.class.php
index 08f2aa7b50..fec398cd4e 100755
--- a/main/gradebook/lib/be/forumthreadlink.class.php
+++ b/main/gradebook/lib/be/forumthreadlink.class.php
@@ -10,47 +10,47 @@
  */
 class ForumThreadLink extends AbstractLink
 {
-	private $forum_thread_table = null;
-	private $itemprop_table = null;
+    private $forum_thread_table = null;
+    private $itemprop_table = null;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_FORUM_THREAD);
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_FORUM_THREAD);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('ForumThreads');
-	}
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('ForumThreads');
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
 
-	/**
-	 * Generate an array of exercises that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
+    /**
+     * Generate an array of exercises that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        if (empty($this->course_code)) {
+            return [];
+        }
 
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-		$sql = 'SELECT thread_id,thread_title,thread_title_qualify 
-		        FROM '.$this->get_forum_thread_table().'
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+        $sql = 'SELECT thread_id,thread_title,thread_title_qualify 
+                FROM '.$this->get_forum_thread_table().'
 			    forum_thread WHERE thread_id NOT IN
 			    (
 			        SELECT ref_id FROM '.$tbl_grade_links.' 
@@ -60,8 +60,7 @@ class ForumThreadLink extends AbstractLink
                 ) 
                 AND forum_thread.session_id='.api_get_session_id();
 
-		$result = Database::query($sql);
-
+        $result = Database::query($sql);
         $cats = array();
         while ($data = Database::fetch_array($result)) {
             if (isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != "") {
@@ -75,7 +74,7 @@ class ForumThreadLink extends AbstractLink
         }
 
         return $cats;
-	}
+    }
 
 	/**
 	 * Generate an array of all exercises available.
@@ -84,7 +83,7 @@ class ForumThreadLink extends AbstractLink
 	public function get_all_links()
 	{
 		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
+			return [];
 		}
 
 		$tbl_grade_links 	= Database :: get_course_table(TABLE_FORUM_THREAD);
@@ -108,18 +107,18 @@ class ForumThreadLink extends AbstractLink
                     '.$session_condition.'
                 ';
 
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			if ( isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != "") {
-				$cats[] = array($data['thread_id'], $data['thread_title_qualify']);
-			} else {
-				$cats[] = array($data['thread_id'], $data['thread_title']);
-			}
-		}
-		$my_cats = isset($cats) ? $cats : null;
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            if (isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != '') {
+                $cats[] = array($data['thread_id'], $data['thread_title_qualify']);
+            } else {
+                $cats[] = array($data['thread_id'], $data['thread_title']);
+            }
+        }
+        $my_cats = isset($cats) ? $cats : null;
 
-		return $my_cats;
-	}
+        return $my_cats;
+    }
 
     /**
     * Has anyone done this exercise yet ?
@@ -138,50 +137,55 @@ class ForumThreadLink extends AbstractLink
         $number = Database::fetch_row($result);
 
         return $number[0] != 0;
-	}
+    }
 
-	/**
-	 * @param int    $stud_id
+    /**
+     * @param int    $stud_id
      * @param string $type
      *
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
         require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
         $threadInfo = get_thread_information('', $this->get_ref_id());
 
-		$thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
+        $thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
 
         $sessionId = $this->get_session_id();
-        $sessionCondition = api_get_session_condition($sessionId, true, false, 'session_id');
-
-		$sql = 'SELECT thread_qualify_max
-		        FROM '.Database :: get_course_table(TABLE_FORUM_THREAD)."
-  				WHERE 
-  				    c_id = ".$this->course_id." AND 
-  				    thread_id = '".$this->get_ref_id()."'
-  				    $sessionCondition
+        $sessionCondition = api_get_session_condition(
+            $sessionId,
+            true,
+            false,
+            'session_id'
+        );
+
+        $sql = 'SELECT thread_qualify_max
+                FROM '.Database :: get_course_table(TABLE_FORUM_THREAD)."
+                WHERE 
+                    c_id = ".$this->course_id." AND 
+                    thread_id = '".$this->get_ref_id()."'
+                    $sessionCondition
                 ";
-		$query = Database::query($sql);
-		$assignment = Database::fetch_array($query);
-
-		$sql = "SELECT * FROM $thread_qualify
-				WHERE 
-				    c_id = ".$this->course_id." AND 
-				    thread_id = ".$this->get_ref_id()."
-				    $sessionCondition
+        $query = Database::query($sql);
+        $assignment = Database::fetch_array($query);
+
+        $sql = "SELECT * FROM $thread_qualify
+                WHERE 
+                    c_id = ".$this->course_id." AND 
+                    thread_id = ".$this->get_ref_id()."
+                    $sessionCondition
                 ";
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_id);
-		}
+        if (isset($stud_id)) {
+            $sql .= ' AND user_id = '.intval($stud_id);
+        }
 
-		// order by id, that way the student's first attempt is accessed first
-		$sql .= ' ORDER BY qualify_time DESC';
-		$scores = Database::query($sql);
+        // order by id, that way the student's first attempt is accessed first
+        $sql .= ' ORDER BY qualify_time DESC';
+        $scores = Database::query($sql);
 
-		// for 1 student
-		if (isset($stud_id)) {
+        // for 1 student
+        if (isset($stud_id)) {
             if ($threadInfo['thread_peer_qualify'] == 0) {
                 // Classic way of calculate score
                 if ($data = Database::fetch_array($scores)) {
@@ -209,176 +213,176 @@ class ForumThreadLink extends AbstractLink
                 }
                 return [$score/$counter, $assignment['thread_qualify_max']];
             }
-		} else {
-			// All students -> get average
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$counter = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($assignment['thread_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['qualify'];
-						$counter++;
-						$sum += $data['qualify'] / $assignment['thread_qualify_max'];
-						$sumResult += $data['qualify'];
-						if ($data['qualify'] > $bestResult) {
-							$bestResult = $data['qualify'];
-						}
-						$weight = $assignment['thread_qualify_max'];
-					}
-				}
-			}
-
-			if ($counter == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult/$counter, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $counter);
-						break;
-				}
-			}
-		}
-	}
+        } else {
+            // All students -> get average
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $counter = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($assignment['thread_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['qualify'];
+                        $counter++;
+                        $sum += $data['qualify'] / $assignment['thread_qualify_max'];
+                        $sumResult += $data['qualify'];
+                        if ($data['qualify'] > $bestResult) {
+                            $bestResult = $data['qualify'];
+                        }
+                        $weight = $assignment['thread_qualify_max'];
+                    }
+                }
+            }
 
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_forum_thread_table()
-	{
-		return $this->forum_thread_table = Database :: get_course_table(TABLE_FORUM_THREAD);
-	}
+            if ($counter == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult/$counter, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $counter);
+                        break;
+                }
+            }
+        }
+    }
 
-	public function needs_name_and_description()
-	{
-		return false;
-	}
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_forum_thread_table()
+    {
+        return $this->forum_thread_table = Database :: get_course_table(TABLE_FORUM_THREAD);
+    }
 
-	public function needs_max()
-	{
-		return false;
-	}
+    public function needs_name_and_description()
+    {
+        return false;
+    }
 
-	public function needs_results()
-	{
-		return false;
-	}
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
 
     /**
      * @return string
      */
-	public function get_name()
-	{
-		$this->get_exercise_data();
-		$thread_title=isset($this->exercise_data['thread_title']) ? $this->exercise_data['thread_title'] : '';
-		$thread_title_qualify=isset($this->exercise_data['thread_title_qualify']) ? $this->exercise_data['thread_title_qualify'] : '';
-		if ( isset($thread_title_qualify) && $thread_title_qualify!="") {
-			return $this->exercise_data['thread_title_qualify'];
-		} else {
-			return $thread_title;
-		}
-	}
+    public function get_name()
+    {
+        $this->get_exercise_data();
+        $thread_title=isset($this->exercise_data['thread_title']) ? $this->exercise_data['thread_title'] : '';
+        $thread_title_qualify=isset($this->exercise_data['thread_title_qualify']) ? $this->exercise_data['thread_title_qualify'] : '';
+        if (isset($thread_title_qualify) && $thread_title_qualify != '') {
+            return $this->exercise_data['thread_title_qualify'];
+        } else {
+            return $thread_title;
+        }
+    }
 
     /**
      * @return string
      */
-	public function get_description()
-	{
-		return '';//$this->exercise_data['description'];
-	}
+    public function get_description()
+    {
+        return '';//$this->exercise_data['description'];
+    }
 
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$sql = 'SELECT count(id) from '.$this->get_forum_thread_table().'
-        		WHERE c_id = '.$this->course_id.' AND thread_id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $sql = 'SELECT count(id) from '.$this->get_forum_thread_table().'
+                WHERE c_id = '.$this->course_id.' AND thread_id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
 
-	public function get_link()
-	{
-		$sessionId = api_get_session_id();
-		//it was extracts the forum id
-		$sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
-    			WHERE c_id = '.$this->course_id.' AND thread_id = '".$this->get_ref_id()."' AND session_id = ".$sessionId."";
-		$result = Database::query($sql);
-		$row    = Database::fetch_array($result,'ASSOC');
-		$forum_id=$row['forum_id'];
-
-		$url = api_get_path(WEB_PATH).'main/forum/viewthread.php?'.api_get_cidreq_params($this->get_course_code(), $sessionId).'&thread='.$this->get_ref_id().'&gradebook=view&forum='.$forum_id;
-		return $url;
-	}
-
-	private function get_exercise_data()
-	{
-		$session_id = api_get_session_id();
-		if ($session_id) {
-			$session_condition = 'session_id='.api_get_session_id();
-		} else {
-			$session_condition = '(session_id = 0 OR session_id IS NULL)';
-		}
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        $sessionId = api_get_session_id();
+        //it was extracts the forum id
+        $sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
+                WHERE c_id = '.$this->course_id.' AND thread_id = '".$this->get_ref_id()."' AND session_id = ".$sessionId."";
+        $result = Database::query($sql);
+        $row    = Database::fetch_array($result,'ASSOC');
+        $forum_id=$row['forum_id'];
 
-		if (!isset($this->exercise_data)) {
-			$sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
+        $url = api_get_path(WEB_PATH).'main/forum/viewthread.php?'.api_get_cidreq_params($this->get_course_code(), $sessionId).'&thread='.$this->get_ref_id().'&gradebook=view&forum='.$forum_id;
+        return $url;
+    }
+
+    private function get_exercise_data()
+    {
+        $session_id = api_get_session_id();
+        if ($session_id) {
+            $session_condition = 'session_id='.api_get_session_id();
+        } else {
+            $session_condition = '(session_id = 0 OR session_id IS NULL)';
+        }
+
+        if (!isset($this->exercise_data)) {
+            $sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
                     WHERE c_id = '.$this->course_id.' AND  thread_id = '.$this->get_ref_id().' AND '.$session_condition;
-			$query = Database::query($sql);
-			$this->exercise_data = Database::fetch_array($query);
-		}
-		return $this->exercise_data;
-	}
+            $query = Database::query($sql);
+            $this->exercise_data = Database::fetch_array($query);
+        }
+        return $this->exercise_data;
+    }
 
-	public function get_icon_name()
-	{
-		return 'forum';
-	}
+    public function get_icon_name()
+    {
+        return 'forum';
+    }
 
-	function save_linked_data()
-	{
-		$weight = $this->get_weight();
-		$ref_id = $this->get_ref_id();
+    function save_linked_data()
+    {
+        $weight = $this->get_weight();
+        $ref_id = $this->get_ref_id();
 
-		if (!empty($ref_id)) {
-			$sql = 'UPDATE '.$this->get_forum_thread_table().' SET 
-			        thread_weight='.api_float_val($weight).'
+        if (!empty($ref_id)) {
+            $sql = 'UPDATE '.$this->get_forum_thread_table().' SET 
+                    thread_weight='.api_float_val($weight).'
                     WHERE c_id = '.$this->course_id.' AND thread_id= '.$ref_id;
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 
-	function delete_linked_data()
-	{
-		$ref_id = $this->get_ref_id();
-		if (!empty($ref_id)) {
-			//Cleans forum
-			$sql = 'UPDATE '.$this->get_forum_thread_table().' SET
-			        thread_qualify_max = 0,
-			        thread_weight = 0,
-			        thread_title_qualify = ""
+    function delete_linked_data()
+    {
+        $ref_id = $this->get_ref_id();
+        if (!empty($ref_id)) {
+            //Cleans forum
+            $sql = 'UPDATE '.$this->get_forum_thread_table().' SET
+                    thread_qualify_max = 0,
+                    thread_weight = 0,
+                    thread_title_qualify = ""
                     WHERE c_id = '.$this->course_id.' AND thread_id= '.$ref_id;
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 }

From 5277b30fd8737f891a1a091b4531fb3fc5654bf6 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 08:45:09 +0100
Subject: [PATCH 47/68] calendar import csv, if course code is different change
 it see BT#12462

---
 main/cron/import_csv.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index f1e44c9d15..f7d04e8940 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CourseBundle\Entity\CCalendarEvent;
+
 if (PHP_SAPI != 'cli') {
     die('Run this script through the command line or comment this line in the code');
 }
@@ -955,10 +957,23 @@ class ImportCsv
                 }
 
                 $courseInfo = api_get_course_info_by_id($event['course_id']);
-                $event['course_info']  = $courseInfo;
-                $event['update']  = $update;
-                $event['item']  = $item;
-                $event['external_event_id']  = $externalEventId;
+                $event['course_info'] = $courseInfo;
+                $event['update'] = $update;
+                $event['item'] = $item;
+
+                /* Check if event changed of course code */
+                /** @var CCalendarEvent $calendarEvent */
+                $calendarEvent = $em->getRepository('ChamiloCourseBundle:CCalendarEvent')->find($item['id']);
+                if ($calendarEvent) {
+                    if ($calendarEvent->getCId() != $courseInfo['real_id']) {
+                        // Seems that the course id changed in the csv
+                        $calendarEvent->setCId($courseInfo['real_id']);
+                        $em->persist($calendarEvent);
+                        $em->flush();
+                    }
+                }
+
+                $event['external_event_id'] = $externalEventId;
 
                 if (isset($eventStartDateList[$courseInfo['real_id']]) &&
                     isset($eventStartDateList[$courseInfo['real_id']][$event['session_id']])
@@ -1094,7 +1109,7 @@ class ImportCsv
                         1
                     );
 
-                    if (count($announcementsWithTitleList) == 0) {
+                    if (count($announcementsWithTitleList) === 0) {
                         $this->logger->addInfo(
                             "Mail to be sent because start date: ".$event['start']." and no announcement found."
                         );

From 801f2d804ef6620a1a54e9fc77b5ace844d59c3c Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 09:17:53 +0100
Subject: [PATCH 48/68] Show errors + add logs

---
 main/cron/import_csv.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index f7d04e8940..4d84d07839 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -15,6 +15,9 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 ini_set('memory_limit', -1);
 ini_set('max_execution_time', 0);
+ini_set('display_errors', '1');
+ini_set('log_errors', '1');
+error_reporting(-1);
 
 /**
  * Class ImportCsv
@@ -909,10 +912,7 @@ class ImportCsv
                 return 0;
             }
 
-            $this->logger->addInfo(
-                "Ready to insert events"
-            );
-
+            $this->logger->addInfo('Ready to insert # '.count($eventsToCreate).' events');
             $batchSize = $this->batchSize;
             $counter = 1;
             $em = Database::getManager();
@@ -921,11 +921,10 @@ class ImportCsv
             $report = [
                 'mail_sent' => 0,
                 'mail_not_sent_announcement_exists' => 0,
-                'mail_not_sent_because_date' => 0,
+                'mail_not_sent_because_date' => 0
             ];
 
             $eventsToCreateFinal = [];
-
             foreach ($eventsToCreate as $event) {
                 $update = false;
                 $item = null;
@@ -963,18 +962,21 @@ class ImportCsv
 
                 /* Check if event changed of course code */
                 /** @var CCalendarEvent $calendarEvent */
-                $calendarEvent = $em->getRepository('ChamiloCourseBundle:CCalendarEvent')->find($item['id']);
+                $calendarEvent = $em->getRepository('ChamiloCourseBundle:CCalendarEvent')->find($item['item_id']);
                 if ($calendarEvent) {
+                    $this->logger->addInfo('Calendar event found '.$item['item_id']);
                     if ($calendarEvent->getCId() != $courseInfo['real_id']) {
+                        $this->logger->addInfo('Move from course #'.$courseInfo['real_id'].' to #'.$calendarEvent->getCId());
                         // Seems that the course id changed in the csv
                         $calendarEvent->setCId($courseInfo['real_id']);
                         $em->persist($calendarEvent);
                         $em->flush();
                     }
+                } else {
+                    $this->logger->addInfo('Calendar event not found '.$item['item_id']);
                 }
 
                 $event['external_event_id'] = $externalEventId;
-
                 if (isset($eventStartDateList[$courseInfo['real_id']]) &&
                     isset($eventStartDateList[$courseInfo['real_id']][$event['session_id']])
                 ) {
@@ -998,7 +1000,6 @@ class ImportCsv
                 $item = $event['item'];
                 $update = $event['update'];
                 $externalEventId = $event['external_event_id'];
-
                 $info = 'Course: '.$courseInfo['real_id'].' ('.$courseInfo['code'].') - Session: '.$event['session_id'];
 
                 $agenda = new Agenda(
@@ -1011,7 +1012,6 @@ class ImportCsv
                 $agenda->setSessionId($event['session_id']);
                 $agenda->setSenderId($event['sender_id']);
                 $agenda->setIsAllowedToEdit(true);
-
                 $eventComment = $event['comment'];
                 $color = $event['color'];
 

From 9f1bcfc703c78bf77f981e64167ed34662378dd4 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 09:31:36 +0100
Subject: [PATCH 49/68] Update also item property see BT#12462

---
 main/cron/import_csv.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 4d84d07839..983c1ead7f 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -2,6 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CourseBundle\Entity\CCalendarEvent;
+use Chamilo\CourseBundle\Entity\CItemProperty;
 
 if (PHP_SAPI != 'cli') {
     die('Run this script through the command line or comment this line in the code');
@@ -15,7 +16,6 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 ini_set('memory_limit', -1);
 ini_set('max_execution_time', 0);
-ini_set('display_errors', '1');
 ini_set('log_errors', '1');
 error_reporting(-1);
 
@@ -966,11 +966,24 @@ class ImportCsv
                 if ($calendarEvent) {
                     $this->logger->addInfo('Calendar event found '.$item['item_id']);
                     if ($calendarEvent->getCId() != $courseInfo['real_id']) {
-                        $this->logger->addInfo('Move from course #'.$courseInfo['real_id'].' to #'.$calendarEvent->getCId());
+                        $this->logger->addInfo('Move from course #'.$calendarEvent->getCId().' to #'.$courseInfo['real_id']);
                         // Seems that the course id changed in the csv
                         $calendarEvent->setCId($courseInfo['real_id']);
                         $em->persist($calendarEvent);
                         $em->flush();
+
+                        $criteria = [
+                            'tool' => 'calendar_event',
+                            'ref' => $item['item_id']
+                        ];
+                        /** @var CItemProperty $itemProperty */
+                        $itemProperty = $em->getRepository('ChamiloCourseBundle:CItemProperty')->findOneBy($criteria);
+                        if ($itemProperty) {
+                            $courseEntity = $em->getRepository('ChamiloCourseBundle:Course')->find($courseInfo['real_id']);
+                            $itemProperty->setCourse($courseEntity);
+                            $em->persist($itemProperty);
+                            $em->flush();
+                        }
                     }
                 } else {
                     $this->logger->addInfo('Calendar event not found '.$item['item_id']);

From 0394fc31a27979b5d254af10659b18cb4618c039 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 09:37:09 +0100
Subject: [PATCH 50/68] Don't show errors

---
 main/cron/import_csv.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 983c1ead7f..c2b64d4999 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -17,7 +17,6 @@ require_once __DIR__.'/../inc/global.inc.php';
 ini_set('memory_limit', -1);
 ini_set('max_execution_time', 0);
 ini_set('log_errors', '1');
-error_reporting(-1);
 
 /**
  * Class ImportCsv
@@ -978,8 +977,8 @@ class ImportCsv
                         ];
                         /** @var CItemProperty $itemProperty */
                         $itemProperty = $em->getRepository('ChamiloCourseBundle:CItemProperty')->findOneBy($criteria);
-                        if ($itemProperty) {
-                            $courseEntity = $em->getRepository('ChamiloCourseBundle:Course')->find($courseInfo['real_id']);
+                        $courseEntity = $em->getRepository('ChamiloCoreBundle:Course')->find($courseInfo['real_id']);
+                        if ($itemProperty && $courseEntity) {
                             $itemProperty->setCourse($courseEntity);
                             $em->persist($itemProperty);
                             $em->flush();

From ee25dc43fb4b7564036c0dec5301f8728d4ab82b Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 10:04:40 +0100
Subject: [PATCH 51/68] Add authorId to avoid errors when calling from
 import_csv.php CLI

---
 main/cron/import_csv.php    |  7 +++----
 main/inc/lib/agenda.lib.php | 11 +++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index c2b64d4999..dd9f3b82f4 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1160,7 +1160,7 @@ class ImportCsv
                     } else {
                         $report['mail_not_sent_announcement_exists']++;
                         $this->logger->addInfo(
-                            "Mail NOT sent. An announcement seems to be already saved in $info"
+                            "Mail NOT sent. An announcement seems to be already saved in '$info'"
                         );
                     }
                 } else {
@@ -1168,7 +1168,6 @@ class ImportCsv
                         $report['mail_not_sent_because_date']++;
                     }
                 }
-
                 $content = '';
                 if ($update && isset($item['item_id'])) {
                     //the event already exists, just update
@@ -1185,7 +1184,8 @@ class ImportCsv
                         $eventComment,
                         $color,
                         false,
-                        false
+                        false,
+                        $this->defaultAdminId
                     );
 
                     if ($eventResult !== false) {
@@ -1215,7 +1215,6 @@ class ImportCsv
                     );
 
                     if (!empty($eventId)) {
-                        //$extraFieldValue->is_course_model = true;
                         $extraFieldValue->save(
                             array(
                                 'value' => $externalEventId,
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index 613eb05ac6..e1172dbab2 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -675,6 +675,7 @@ class Agenda
      * @param string $color
      * @param bool $addAnnouncement
      * @param bool $updateContent
+     * @param int $authorId
      *
      * @return null|false
      */
@@ -691,11 +692,13 @@ class Agenda
         $comment = null,
         $color = '',
         $addAnnouncement = false,
-        $updateContent = true
+        $updateContent = true,
+        $authorId = 0
     ) {
         $start = api_get_utc_datetime($start);
         $end = api_get_utc_datetime($end);
         $allDay = isset($allDay) && $allDay == 'true' ? 1 : 0;
+        $authorId = empty($authorId) ? api_get_user_id() : (int) $authorId;
 
         switch ($this->type) {
             case 'personal':
@@ -846,7 +849,7 @@ class Agenda
                                 TOOL_CALENDAR_EVENT,
                                 $id,
                                 'visible',
-                                api_get_user_id(),
+                                $authorId,
                                 $groupIid,
                                 null,
                                 $start,
@@ -882,7 +885,7 @@ class Agenda
                                         TOOL_CALENDAR_EVENT,
                                         $id,
                                         'visible',
-                                        api_get_user_id(),
+                                        $authorId,
                                         $groupIidItem,
                                         0,
                                         $start,
@@ -924,7 +927,7 @@ class Agenda
                                         TOOL_CALENDAR_EVENT,
                                         $id,
                                         'visible',
-                                        api_get_user_id(),
+                                        $authorId,
                                         $groupIid,
                                         $userId,
                                         $start,

From 6ad9c6b2535182ec38cda93f9657d97e40cf3832 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 10:28:58 +0100
Subject: [PATCH 52/68] Update folders

---
 .codeclimate.yml | 2 ++
 .scrutinizer.yml | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index a4d115102b..1524ee7671 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -36,6 +36,7 @@ exclude_paths:
 - main/admin/db.php
 - main/auth/cas/lib/CAS/
 - main/auth/shibboleth
+- main/auth/openid
 - main/inc/lib/browser/
 - main/inc/lib/freemindflashbrowser/
 - main/inc/lib/internationalization_database/
@@ -59,6 +60,7 @@ exclude_paths:
 - plugin/buycourses/src/Requests/
 - plugin/kannelsms/vendor/
 - plugin/clockworksms/vendor/
+- plugin/pens/lib
 - tests/
 - vendor/
 - web/
\ No newline at end of file
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index fc165b713f..aed959b392 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -134,7 +134,8 @@ filter:
         - 'app/Resources/*'
         - 'main/admin/db.php'
         - 'main/auth/cas/lib/CAS/*'
-        - 'main/auth/shibboleth'
+        - 'main/auth/shibboleth/*'
+        - 'main/auth/openid/*'
         - 'main/inc/lib/browser/*'
         - 'main/inc/lib/freemindflashbrowser/*'
         - 'main/inc/lib/internationalization_database/*'
@@ -162,6 +163,7 @@ filter:
         - 'plugin/buycourses/src/Requests/*'
         - 'plugin/kannelsms/vendor/*'
         - 'plugin/clockworksms/vendor/*'
+        - 'plugin/pens/lib/'
         - 'tests/*'
         - 'vendor/*'
         - 'web/*'

From a4d28af0e4e86fd4012576f2f57b9075888cd0da Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 17 Mar 2017 09:30:02 +0000
Subject: [PATCH 53/68] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 custompages/language.php                      |  3 +-
 main/announcements/download.php               |  4 ++-
 main/course_progress/thematic_plan.php        |  5 ++--
 main/document/edit_draw.php                   |  5 ++--
 main/exercise/overview.php                    |  3 +-
 main/gradebook/gradebook_add_result.php       |  4 ++-
 .../gradebook/lib/fe/gradebooktable.class.php |  5 ++--
 main/mySpace/access_details.php               |  2 +-
 main/reports/index.php                        |  3 +-
 main/reports/reports.cli.php                  |  7 +++--
 main/session/session_add.php                  |  3 +-
 main/session/session_course_list.php          |  2 +-
 main/ticket/tickets.php                       |  5 ++--
 main/tracking/course_session_report.php       | 12 ++++++--
 main/tracking/lp_results_by_user.php          |  3 +-
 plugin/vchamilo/cli/bulkdestroynodes.php      | 28 +++++++++++++-----
 plugin/vchamilo/views/manage.controller.php   |  2 +-
 .../CoreBundle/Component/Editor/Finder.php    |  3 +-
 .../Component/CourseCopy/CourseRestorer.php   | 29 ++++++++++---------
 .../Controller/WidgetController.php           | 18 ++++++++----
 .../ThemeBundle/Form/FormDemoModelType.php    |  3 +-
 .../ThemeBundle/Model/MessageInterface.php    |  3 +-
 .../ThemeBundle/Model/MessageModel.php        |  3 +-
 .../Model/NotificationInterface.php           |  3 +-
 src/Chamilo/ThemeBundle/Model/TaskModel.php   |  3 +-
 .../ThemeBundle/Model/UserInterface.php       |  3 +-
 src/Chamilo/ThemeBundle/Model/UserModel.php   |  6 ++--
 .../ThemeBundle/Theme/ThemeManager.php        | 19 +++++++-----
 .../ThemeBundle/Twig/WidgetExtension.php      |  6 ++--
 29 files changed, 128 insertions(+), 67 deletions(-)

diff --git a/custompages/language.php b/custompages/language.php
index 4bcb2a5187..cff015a6f0 100755
--- a/custompages/language.php
+++ b/custompages/language.php
@@ -23,8 +23,9 @@ $chamilo_langs = array(
 );
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
 // recover previous value ...
-if (isset($_SESSION['user_language_choice']))
+if (isset($_SESSION['user_language_choice'])) {
 	$lang_match = $_SESSION['user_language_choice'];
+}
 
 // Chamilo parameter, on logout
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
diff --git a/main/announcements/download.php b/main/announcements/download.php
index 89b3e53b75..7f078c9729 100755
--- a/main/announcements/download.php
+++ b/main/announcements/download.php
@@ -43,7 +43,9 @@ if (is_dir($full_file_name)) {
     //remove last slash if present
     //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
     //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
-    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+    while ($doc_url{$dul = strlen($doc_url)-1}=='/') {
+        $doc_url = substr($doc_url,0,$dul);
+    }
     //create the path
     $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
     //redirect
diff --git a/main/course_progress/thematic_plan.php b/main/course_progress/thematic_plan.php
index f68e0da4ef..486759ebbf 100755
--- a/main/course_progress/thematic_plan.php
+++ b/main/course_progress/thematic_plan.php
@@ -9,9 +9,10 @@
 
 // actions menu
 $new_thematic_plan_data = array();
-if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+if (!empty($thematic_plan_data)) {
+    foreach($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
+}
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
 
diff --git a/main/document/edit_draw.php b/main/document/edit_draw.php
index 2c4eec1236..d9ef8206a9 100755
--- a/main/document/edit_draw.php
+++ b/main/document/edit_draw.php
@@ -96,13 +96,14 @@ if (!empty($group_id)) {
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
-if (!$is_certificate_mode)
+if (!$is_certificate_mode) {
     $interbreadcrumb[] = array(
         "url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(),
         "name" => get_lang('Documents'),
     );
-else
+} else {
     $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+}
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
diff --git a/main/exercise/overview.php b/main/exercise/overview.php
index 6de26876e5..ef0630c504 100755
--- a/main/exercise/overview.php
+++ b/main/exercise/overview.php
@@ -268,8 +268,7 @@ if (!empty($attempts)) {
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
-            }
-            else {
+            } else {
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));
             }
             break;
diff --git a/main/gradebook/gradebook_add_result.php b/main/gradebook/gradebook_add_result.php
index eaa9ec7f9a..61d34567ff 100755
--- a/main/gradebook/gradebook_add_result.php
+++ b/main/gradebook/gradebook_add_result.php
@@ -41,7 +41,9 @@ if ($add_result_form->validate()) {
         $res->set_evaluation_id($values['evaluation_id']);
         $res->set_user_id(key($scores));
         //if no scores are given, don't set the score
-        if ((!empty ($row)) || ($row == '0')) $res->set_score($row);
+        if ((!empty ($row)) || ($row == '0')) {
+            $res->set_score($row);
+        }
         $res->add();
         next($scores);
     }
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index e322e4de54..76962d5b54 100755
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -254,10 +254,11 @@ class GradebookTable extends SortableTable
         }
 
         // Categories.
-        if (!empty($data_array))
-        foreach ($data_array as $data) {
+        if (!empty($data_array)) {
+                foreach ($data_array as $data) {
             // list of items inside the gradebook (exercises, lps, forums, etc)
             $row  = array();
+        }
             /** @var AbstractLink $item */
             $item = $mainCategory = $data[0];
 
diff --git a/main/mySpace/access_details.php b/main/mySpace/access_details.php
index c69b3ae34e..5608478c63 100755
--- a/main/mySpace/access_details.php
+++ b/main/mySpace/access_details.php
@@ -144,7 +144,7 @@ $form->display();
         </div><br />
         <div id="cev_cont_stats">
             <?php
-            if ($result_to_print != "")  {
+            if ($result_to_print != "") {
                 $rst = get_stats($user_id, $courseId);
                 $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
                 $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
diff --git a/main/reports/index.php b/main/reports/index.php
index be4affaabb..e843732f8c 100755
--- a/main/reports/index.php
+++ b/main/reports/index.php
@@ -25,8 +25,9 @@ $this_section = SECTION_REPORTS;
 $tool_name=get_lang('Reports');
 
 // Displaying the header
-foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js)
+foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+}
 
 // FIXME
 $htmlHeadXtra[] = '    <style type="text/css">
diff --git a/main/reports/reports.cli.php b/main/reports/reports.cli.php
index 5ee9644d28..a8f4a292ff 100755
--- a/main/reports/reports.cli.php
+++ b/main/reports/reports.cli.php
@@ -32,9 +32,9 @@ $options = getopt("", $longopts);
 
 echo "\n\n";
 
-if (array_key_exists('help', $options))
+if (array_key_exists('help', $options)) {
 	echo "help message\n";
-else if (array_key_exists('clearAll', $options)) {
+} else if (array_key_exists('clearAll', $options)) {
 	reports_clearAll();
 } else if (array_key_exists('build', $options)) {
 	reports_build();
@@ -51,8 +51,9 @@ else if (array_key_exists('clearAll', $options)) {
 			$options['ssci'], $options['sscn'],
 			$options['link']);
 	echo "\n";
-} else
+} else {
 	echo "action not found\n";
+}
 
 echo "\n";
 ?>
diff --git a/main/session/session_add.php b/main/session/session_add.php
index 3ddc930074..e9903dd67a 100644
--- a/main/session/session_add.php
+++ b/main/session/session_add.php
@@ -127,7 +127,8 @@ $tool_name = get_lang('AddSession');
 
 $urlAction = api_get_self();
 
-function check_session_name($name) {
+function check_session_name($name)
+{
     $session = SessionManager::get_session_by_name($name);
 
     return empty($session) ? true : false;
diff --git a/main/session/session_course_list.php b/main/session/session_course_list.php
index da5d4899f2..1fa68625fa 100644
--- a/main/session/session_course_list.php
+++ b/main/session/session_course_list.php
@@ -38,7 +38,7 @@ if ($action == 'delete') {
     $idChecked = $_REQUEST['idChecked'];
     if (is_array($idChecked) && count($idChecked)>0) {
         $my_temp = array();
-        foreach ($idChecked as $id){
+        foreach ($idChecked as $id) {
             $my_temp[]= Database::escape_string($id);// forcing the escape_string
         }
         $idChecked = $my_temp;
diff --git a/main/ticket/tickets.php b/main/ticket/tickets.php
index 05f2147cfa..46b692a125 100644
--- a/main/ticket/tickets.php
+++ b/main/ticket/tickets.php
@@ -127,8 +127,8 @@ $user_id = api_get_user_id();
 $isAdmin = api_is_platform_admin();
 
 Display::display_header(get_lang('MyTickets'));
-if (!empty($projectId))
-if ($isAdmin) {
+if (!empty($projectId)) {
+    if ($isAdmin) {
     $getParameters = [
         'keyword',
         'keyword_status',
@@ -140,6 +140,7 @@ if ($isAdmin) {
         'Tickets_per_page',
         'Tickets_column'
     ];
+}
     $get_parameter = '';
     foreach ($getParameters as $getParameter) {
         if (isset($_GET[$getParameter])) {
diff --git a/main/tracking/course_session_report.php b/main/tracking/course_session_report.php
index e8f3cc2eac..bd9ce8876a 100755
--- a/main/tracking/course_session_report.php
+++ b/main/tracking/course_session_report.php
@@ -47,8 +47,16 @@ if (count($session_list) == 0) {
 $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list);
 $form->addButtonFilter(get_lang('Filter'));
 
-if (!empty($_REQUEST['score']))	$filter_score = intval($_REQUEST['score']); else $filter_score = 70;
-if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0;
+if (!empty($_REQUEST['score'])) {
+    $filter_score = intval($_REQUEST['score']);
+} else {
+    $filter_score = 70;
+}
+if (!empty($_REQUEST['session_id'])) {
+    $session_id = intval($_REQUEST['session_id']);
+} else {
+    $session_id = 0;
+}
 
 if (empty($session_id)) {
 	$session_id = key($my_session_list);
diff --git a/main/tracking/lp_results_by_user.php b/main/tracking/lp_results_by_user.php
index c93f751b51..04240155b1 100755
--- a/main/tracking/lp_results_by_user.php
+++ b/main/tracking/lp_results_by_user.php
@@ -73,8 +73,9 @@ if ($global) {
 //$form->addElement('submit','submit',get_lang('Filter'));
 $form->addButtonFilter(get_lang('Filter'));
 
-if (!empty($_REQUEST['course_code']))
+if (!empty($_REQUEST['course_code'])) {
     $selected_course = $_REQUEST['course_code'];
+}
 if (!empty($selected_course)) {
     $selected_course = api_get_course_info($selected_course);
     $course_list = array($selected_course);
diff --git a/plugin/vchamilo/cli/bulkdestroynodes.php b/plugin/vchamilo/cli/bulkdestroynodes.php
index 0c2abe0204..b217d55165 100644
--- a/plugin/vchamilo/cli/bulkdestroynodes.php
+++ b/plugin/vchamilo/cli/bulkdestroynodes.php
@@ -92,25 +92,39 @@ if (!empty($options['config'])) {
 }
 
 require_once($_configuration['root_sys'].'local/classes/database.class.php');       // cli only functions
-if ($options['verbose']) echo "loaded dbclass\n";
+if ($options['verbose']) {
+    echo "loaded dbclass\n";
+}
 require_once($_configuration['root_sys'].'local/classes/textlib.class.php');       // cli only functions
-if ($options['verbose']) echo "loaded textlib\n";
+if ($options['verbose']) {
+    echo "loaded textlib\n";
+}
 require_once($_configuration['root_sys'].'local/classes/mootochamlib.php');       // moodle like API
-if ($options['verbose']) echo "loaded moodle wrapping\n";
+if ($options['verbose']) {
+    echo "loaded moodle wrapping\n";
+}
 require_once($_configuration['root_sys'] . '/plugin/vchamilo/lib/vchamilo_plugin.class.php');
-if ($options['verbose']) echo "loaded vchamilo plugin\n";
+if ($options['verbose']) {
+    echo "loaded vchamilo plugin\n";
+}
 
 global $DB;
-if ($options['verbose']) echo "building database manager\n";
+if ($options['verbose']) {
+    echo "building database manager\n";
+}
 $DB = new DatabaseManager();
-if ($options['verbose']) echo "building plugin vchamilo\n";
+if ($options['verbose']) {
+    echo "building plugin vchamilo\n";
+}
 $plugin = VChamiloPlugin::create();
 
 if (empty($options['nodes'])) {
     cli_error(get_string('climissingnodes', 'block_vmoodle'));
 }
 
-if ($options['verbose']) echo "parsing nodelist\n";
+if ($options['verbose']) {
+    echo "parsing nodelist\n";
+}
 $nodes = vchamilo_parse_csv_nodelist($options['nodes'], $plugin);
 
 if ($options['lint']) {
diff --git a/plugin/vchamilo/views/manage.controller.php b/plugin/vchamilo/views/manage.controller.php
index 254ace5e8d..7e5c1b0427 100644
--- a/plugin/vchamilo/views/manage.controller.php
+++ b/plugin/vchamilo/views/manage.controller.php
@@ -302,7 +302,7 @@ switch ($action) {
     case 'clearcache':
         // Removes cache directory.
         if (empty($automation)) {
-            if (array_key_exists('vids', $_REQUEST))  {
+            if (array_key_exists('vids', $_REQUEST)) {
                 $toclear = Database::select('*', 'vchamilo', array('where' => array("id IN ('$vidlist')" => array())));
             } else {
                 $vid = isset($_REQUEST['vid']) ? $_REQUEST['vid'] : 0;
diff --git a/src/Chamilo/CoreBundle/Component/Editor/Finder.php b/src/Chamilo/CoreBundle/Component/Editor/Finder.php
index c42f13747a..1a85ed0edd 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/Finder.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/Finder.php
@@ -29,7 +29,8 @@ class Finder extends \elFinder
      * @param  array  elFinder and roots configurations
      * @author Dmitry (dio) Levashov
      */
-    public function __construct($opts) {
+    public function __construct($opts)
+    {
         // set error handler of WARNING, NOTICE
         $errLevel = E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_STRICT | E_RECOVERABLE_ERROR;
         if (defined('E_DEPRECATED')) {
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
index 6cdf92195a..72adeb793c 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
@@ -931,7 +931,7 @@ class CourseRestorer
      * see #7029
 	 */
 	public function restore_scorm_documents()
-    {
+	{
 		$perm = api_get_permissions_for_new_directories();
 
 		if ($this->course->has_resources(RESOURCE_SCORM)) {
@@ -1008,7 +1008,7 @@ class CourseRestorer
      * @param int $sessionId
      */
 	public function restore_forums($sessionId = 0)
-    {
+	{
 		if ($this->course->has_resources(RESOURCE_FORUM)) {
             $sessionId = intval($sessionId);
 			$table_forum = Database::get_course_table(TABLE_FORUM);
@@ -2676,7 +2676,7 @@ class CourseRestorer
 
 				// Updating prerequisites
 				foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
-					if ($my_old_prerequisite != ''){
+					if ($my_old_prerequisite != '') {
 						$sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
 						Database::query($sql);
@@ -2694,7 +2694,7 @@ class CourseRestorer
 
 				foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
 					$parent_new_id = 0;
-					if($parent_item_old_id != 0){
+					if($parent_item_old_id != 0) {
 						$parent_new_id = $new_item_ids[$parent_item_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
@@ -2703,7 +2703,7 @@ class CourseRestorer
 				}
 				foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
 					$previous_new_id = 0;
-					if ($previous_item_old_id != 0){
+					if ($previous_item_old_id != 0) {
 						$previous_new_id = $new_item_ids[$previous_item_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
@@ -2713,7 +2713,7 @@ class CourseRestorer
 
 				foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
 					$next_new_id = 0;
-					if ($next_item_old_id != 0){
+					if ($next_item_old_id != 0) {
 						$next_new_id = $new_item_ids[$next_item_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
@@ -2723,7 +2723,7 @@ class CourseRestorer
 
 				foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
 					$prerequisite_new_id = 0;
-					if ($prerequisite_old_id != 0){
+					if ($prerequisite_old_id != 0) {
 						$prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
@@ -2741,7 +2741,7 @@ class CourseRestorer
      *
 	 */
 	public function restore_student_publication($sessionId = 0)
-    {
+	{
         $sessionId = intval($sessionId);
         $work_assignment_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
         $work_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION);
@@ -2841,8 +2841,10 @@ class CourseRestorer
         if (!is_dir($dest)) {
             mkdir($dest, api_get_permissions_for_new_directories());
         }
-        if ($handle = opendir($source)) {        // if the folder exploration is sucsessful, continue
-            while (false !== ($file = readdir($handle))) { // as long as storing the next file to $file is successful, continue
+        if ($handle = opendir($source)) {
+// if the folder exploration is sucsessful, continue
+            while (false !== ($file = readdir($handle))) {
+// as long as storing the next file to $file is successful, continue
                 if ($file != '.' && $file != '..') {
                     $path = $source . '/' . $file;
                     if (is_file($path)) {
@@ -2851,8 +2853,9 @@ class CourseRestorer
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
                     } elseif(is_dir($path)) {
-                        if (!is_dir($dest . '/' . $file))
-                        mkdir($dest . '/' . $file);
+                        if (!is_dir($dest . '/' . $file)) {
+                                                mkdir($dest . '/' . $file);
+                        }
                         self:: allow_create_all_directory($path, $dest . '/' . $file, $overwrite);
                     }
                 }
@@ -3380,7 +3383,7 @@ class CourseRestorer
     public function DBUTF8_array($array)
     {
         if (UTF8_CONVERT) {
-            foreach ($array as &$item)  {
+            foreach ($array as &$item) {
                 $item = utf8_encode($item);
             }
             return $array;
diff --git a/src/Chamilo/ThemeBundle/Controller/WidgetController.php b/src/Chamilo/ThemeBundle/Controller/WidgetController.php
index 7117cf2bb6..dc9eb5aa94 100644
--- a/src/Chamilo/ThemeBundle/Controller/WidgetController.php
+++ b/src/Chamilo/ThemeBundle/Controller/WidgetController.php
@@ -12,19 +12,27 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class WidgetController extends Controller {
+class WidgetController extends Controller
+{
 
-    public function defaultBoxAction() {
+    public function defaultBoxAction()
+    {
 
 
 
     }
 
-    public function solidBoxAction() {}
+    public function solidBoxAction()
+    {
+}
 
-    public function tiledBoxAction() {}
+    public function tiledBoxAction()
+    {
+}
 
-    public function smallBoxAction() {}
+    public function smallBoxAction()
+    {
+}
 
 
 }
diff --git a/src/Chamilo/ThemeBundle/Form/FormDemoModelType.php b/src/Chamilo/ThemeBundle/Form/FormDemoModelType.php
index 20d2c5d535..56f6a7e14d 100644
--- a/src/Chamilo/ThemeBundle/Form/FormDemoModelType.php
+++ b/src/Chamilo/ThemeBundle/Form/FormDemoModelType.php
@@ -11,7 +11,8 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class FormDemoModelType extends AbstractType{
+class FormDemoModelType extends AbstractType
+{
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Chamilo/ThemeBundle/Model/MessageInterface.php b/src/Chamilo/ThemeBundle/Model/MessageInterface.php
index 9f72cd95d3..f751dd2390 100644
--- a/src/Chamilo/ThemeBundle/Model/MessageInterface.php
+++ b/src/Chamilo/ThemeBundle/Model/MessageInterface.php
@@ -12,7 +12,8 @@ namespace Chamilo\ThemeBundle\Model;
  * Representation of a displayable message in the theme's messages section
  *
  */
-interface MessageInterface {
+interface MessageInterface
+{
     /**
      * Returns the sender
      *
diff --git a/src/Chamilo/ThemeBundle/Model/MessageModel.php b/src/Chamilo/ThemeBundle/Model/MessageModel.php
index c2477ad7a4..32d9821d5e 100644
--- a/src/Chamilo/ThemeBundle/Model/MessageModel.php
+++ b/src/Chamilo/ThemeBundle/Model/MessageModel.php
@@ -157,7 +157,8 @@ class MessageModel implements MessageInterface
      *
      * @return string
      */
-    public function getIdentifier() {
+    public function getIdentifier()
+    {
         return $this->getSubject();
     }
 
diff --git a/src/Chamilo/ThemeBundle/Model/NotificationInterface.php b/src/Chamilo/ThemeBundle/Model/NotificationInterface.php
index acc1dcc3bb..c9d695bf0b 100644
--- a/src/Chamilo/ThemeBundle/Model/NotificationInterface.php
+++ b/src/Chamilo/ThemeBundle/Model/NotificationInterface.php
@@ -8,7 +8,8 @@
 namespace Chamilo\ThemeBundle\Model;
 
 
-interface NotificationInterface {
+interface NotificationInterface
+{
     public function getMessage();
     public function getType();
     public function getIcon();
diff --git a/src/Chamilo/ThemeBundle/Model/TaskModel.php b/src/Chamilo/ThemeBundle/Model/TaskModel.php
index b008ed677d..d3a0ec757c 100644
--- a/src/Chamilo/ThemeBundle/Model/TaskModel.php
+++ b/src/Chamilo/ThemeBundle/Model/TaskModel.php
@@ -119,7 +119,8 @@ class TaskModel implements TaskInterface
         return $this->title;
     }
 
-    public function getIdentifier() {
+    public function getIdentifier()
+    {
         return $this->title;
     }
 
diff --git a/src/Chamilo/ThemeBundle/Model/UserInterface.php b/src/Chamilo/ThemeBundle/Model/UserInterface.php
index 8390c22796..41eb62e26c 100644
--- a/src/Chamilo/ThemeBundle/Model/UserInterface.php
+++ b/src/Chamilo/ThemeBundle/Model/UserInterface.php
@@ -8,7 +8,8 @@
 namespace Chamilo\ThemeBundle\Model;
 
 
-interface UserInterface {
+interface UserInterface
+{
     public function getAvatar();
     public function getUsername();
     public function getMemberSince();
diff --git a/src/Chamilo/ThemeBundle/Model/UserModel.php b/src/Chamilo/ThemeBundle/Model/UserModel.php
index 1ca061df55..d64d5ced13 100644
--- a/src/Chamilo/ThemeBundle/Model/UserModel.php
+++ b/src/Chamilo/ThemeBundle/Model/UserModel.php
@@ -8,7 +8,8 @@
 namespace Chamilo\ThemeBundle\Model;
 
 
-class UserModel implements  UserInterface {
+class UserModel implements  UserInterface
+{
 
     /**
      * @var string
@@ -124,7 +125,8 @@ class UserModel implements  UserInterface {
         return $this->getIsOnline();
     }
 
-    public function getIdentifier() {
+    public function getIdentifier()
+    {
         return str_replace(' ', '-', $this->getUsername());
     }
 }
diff --git a/src/Chamilo/ThemeBundle/Theme/ThemeManager.php b/src/Chamilo/ThemeBundle/Theme/ThemeManager.php
index 2d7fcf2164..c08150aaf0 100644
--- a/src/Chamilo/ThemeBundle/Theme/ThemeManager.php
+++ b/src/Chamilo/ThemeBundle/Theme/ThemeManager.php
@@ -52,7 +52,8 @@ class ThemeManager
 
     }
 
-    public function registerStyle($id, $src, $deps = array()) {
+    public function registerStyle($id, $src, $deps = array())
+    {
         if(!isset($this->stylesheets[$id])) {
             $this->stylesheets[$id] = array(
                 'src'      => $src,
@@ -61,7 +62,8 @@ class ThemeManager
         }
     }
 
-    public function getScripts($location = 'bottom') {
+    public function getScripts($location = 'bottom')
+    {
 
         $unsorted = array(); $srcList = array(); $assetList = array();
         foreach($this->javascripts as $id => $scriptDefinition) {
@@ -71,16 +73,17 @@ class ThemeManager
         }
 
         $queue = $this->getResolver()->register($unsorted)->resolveAll();
-        foreach($queue as $def){
+        foreach($queue as $def) {
             $srcList[] = $def['src'];
         }
         return $srcList;
     }
 
-    public function getStyles() {
+    public function getStyles()
+    {
         $srcList = array();
         $queue = $this->getResolver()->register($this->stylesheets)->resolveAll();
-        foreach($queue as $def){
+        foreach($queue as $def) {
             $srcList[] = $def['src'];
         }
         return $srcList;
@@ -89,7 +92,8 @@ class ThemeManager
     /**
      * @return DependencyResolverInterface
      */
-    protected function getResolver() {
+    protected function getResolver()
+    {
         $class = $this->resolverClass;
         return new $class;
     }
@@ -97,7 +101,8 @@ class ThemeManager
     /**
      * @return FileLocator
      */
-    protected function getLocator() {
+    protected function getLocator()
+    {
         return $this->container->get('file_locator');
     }
 
diff --git a/src/Chamilo/ThemeBundle/Twig/WidgetExtension.php b/src/Chamilo/ThemeBundle/Twig/WidgetExtension.php
index a113156460..f210df80a6 100644
--- a/src/Chamilo/ThemeBundle/Twig/WidgetExtension.php
+++ b/src/Chamilo/ThemeBundle/Twig/WidgetExtension.php
@@ -10,14 +10,16 @@ namespace Chamilo\ThemeBundle\Twig;
 
 use Twig_Environment;
 
-class WidgetExtension extends \Twig_Extension {
+class WidgetExtension extends \Twig_Extension
+{
 
     /**
      * @var Twig_Environment
      */
     protected $env;
 
-    public function renderWidget() {
+    public function renderWidget()
+    {
 
     }
 

From 6507b7772a7335a105a3dae2da99d5d2dab0a88d Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 17 Mar 2017 10:10:20 +0000
Subject: [PATCH 54/68] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 .../admin/access_url_add_usergroup_to_url.php |  8 +--
 main/admin/access_url_check_user_session.php  | 12 ++---
 main/admin/access_url_edit_courses_to_url.php | 26 +++++-----
 main/admin/archive_cleanup.php                |  2 +-
 main/admin/configure_extensions.php           | 10 ++--
 main/admin/course_intro_pdf_import.php        | 10 ++--
 main/admin/course_list.php                    | 26 +++++-----
 main/admin/course_request_accepted.php        |  2 +-
 main/admin/extra_field_options.php            | 30 +++++------
 .../admin/ldap_import_students_to_session.php | 38 +++++++-------
 main/admin/skills_wheel.php                   |  2 +-
 main/admin/system_status.php                  |  2 +-
 main/admin/usergroup_export.php               |  4 +-
 main/attendance/attendance_edit.php           | 12 ++---
 .../shibboleth/test/shibboleth_test.class.php |  2 +-
 main/blog/blog.php                            | 46 ++++++++---------
 main/calendar/ical_export.php                 |  6 +--
 main/course_description/add.php               | 10 ++--
 main/course_description/edit.php              | 12 ++---
 main/course_description/listing.php           | 18 +++----
 main/course_progress/thematic_plan.php        |  8 +--
 main/forum/newthread.php                      |  6 +--
 main/gradebook/gradebook_add_link.php         |  2 +-
 main/gradebook/lib/be/linkfactory.class.php   |  4 +-
 main/gradebook/lib/fe/usertable.class.php     | 10 ++--
 main/inc/ajax/link.ajax.php                   |  2 +-
 main/inc/ajax/session.ajax.php                |  4 +-
 main/inc/lib/AnnouncementEmail.php            |  2 +-
 .../add_courses_to_session_functions.lib.php  | 20 ++++----
 main/inc/lib/extra_field_option.lib.php       |  4 +-
 main/inc/lib/lp_item.lib.php                  |  2 +-
 main/inc/lib/security.lib.php                 |  6 +--
 main/lp/aiccItem.class.php                    |  2 +-
 main/lp/blank.php                             |  2 +-
 main/lp/lp_ajax_save_item.php                 |  6 +--
 main/lp/lp_edit_item.php                      |  8 +--
 main/lp/lp_subscribe_users.php                |  2 +-
 main/mySpace/course.php                       |  6 +--
 main/mySpace/users.php                        | 16 +++---
 main/session/session_import_drh.php           |  4 +-
 main/social/group_add.php                     |  6 +--
 main/social/group_invitation.php              | 18 +++----
 main/survey/ch_multiplechoice.php             |  4 +-
 main/survey/ch_score.php                      |  2 +-
 main/survey/ch_yesno.php                      |  2 +-
 main/survey/link.php                          |  2 +-
 main/ticket/categories.php                    |  4 +-
 main/tracking/course_session_report.php       | 50 +++++++++----------
 main/user/class.php                           |  2 +-
 main/user/classes.php                         |  4 +-
 .../Component/CourseCopy/CourseBuilder.php    |  2 +-
 .../CourseCopy/Resources/CourseSession.php    |  2 +-
 .../CourseCopy/Resources/Glossary.php         |  4 +-
 .../Component/CourseCopy/Resources/Link.php   |  2 +-
 .../CourseCopy/Resources/LinkCategory.php     |  4 +-
 55 files changed, 251 insertions(+), 251 deletions(-)

diff --git a/main/admin/access_url_add_usergroup_to_url.php b/main/admin/access_url_add_usergroup_to_url.php
index 1b7ba022ce..3d85b9c71d 100755
--- a/main/admin/access_url_add_usergroup_to_url.php
+++ b/main/admin/access_url_add_usergroup_to_url.php
@@ -30,8 +30,8 @@ $tbl_user = Database:: get_main_table(TABLE_MAIN_USER);
 $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
 
 $tool_name = get_lang('AddUserGroupToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 Display::display_header($tool_name);
 
@@ -46,8 +46,8 @@ api_display_tool_title($tool_name);
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
-    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array() ;
-    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array();
+    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
     $firstLetterUserGroup = $_POST['first_letter_user_group'];
 
     if ($form_sent == 1) {
diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php
index de09b076a5..9d39cfd0ce 100755
--- a/main/admin/access_url_check_user_session.php
+++ b/main/admin/access_url_check_user_session.php
@@ -15,18 +15,18 @@ api_protect_admin_script(true);
 
 $tool_name = get_lang('SessionOverview');
 
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 // Database Table Definitions
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 $table_access_url_user              = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 $url_id                             = api_get_current_access_url_id();
 
 $action = $_GET['action'];
 
-switch($action) {
+switch ($action) {
     case 'add_user_to_url':
         $user_id = $_REQUEST['user_id'];
         $result = UrlManager::add_user_to_url($user_id, $url_id);
@@ -58,7 +58,7 @@ if ($show_users_with_problems) {
 }
 
 
-foreach($session_list  as $session_item) {
+foreach ($session_list  as $session_item) {
     $session_id = $session_item['id'];
     $html .= '<h3>'.$session_item['name'].'</h3>';
 
diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
index 16b741f519..68c39806ce 100755
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -35,12 +35,12 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 $add_type = 'multiple';
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 $access_url_id = 1;
-if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!='') {
+if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id'] != '') {
 	$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
 }
 
@@ -157,23 +157,23 @@ $url_list = UrlManager::get_url_data();
 		<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
 	</div>
 	<br /><br />
-	<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?> >
+	<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?> >
 		<?php echo get_lang('SelectUrl').' : '; ?>
 		<select name="access_url_id" onchange="javascript:send();">
 			<option value="0">-- <?php echo get_lang('SelectUrl')?> -- </option>
 			<?php
-			$url_selected='';
+			$url_selected = '';
 			foreach ($url_list as $url_obj) {
 				$checked = '';
 				if (!empty($access_url_id)) {
-					if ($url_obj[0]==$access_url_id) {
+					if ($url_obj[0] == $access_url_id) {
 						$checked = 'selected=true';
-						$url_selected=$url_obj[1];
+						$url_selected = $url_obj[1];
 					}
 				}
-				if ($url_obj['active']==1) {
+				if ($url_obj['active'] == 1) {
 					?>
-					<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
+					<option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
 				<?php
 				}
 			}
@@ -196,7 +196,7 @@ $url_list = UrlManager::get_url_data();
 				<td align="center">
 					<div id="content_source">
 						<?php
-						if($ajax_search) {
+						if ($ajax_search) {
 							?>
 							<input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" />
 							<div id="ajax_list_courses"></div>
@@ -205,7 +205,7 @@ $url_list = UrlManager::get_url_data();
 							?>
 							<select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
 								<?php
-								foreach($no_course_list as $no_course) {
+								foreach ($no_course_list as $no_course) {
 									?>
 									<option value="<?php echo $no_course['id']; ?>"><?php echo $no_course['title'].' ('.$no_course['code'].')'; ?></option>
 								<?php
@@ -220,7 +220,7 @@ $url_list = UrlManager::get_url_data();
 				</td>
 				<td width="10%" valign="middle" align="center">
 					<?php
-					if($ajax_search) {
+					if ($ajax_search) {
 						?>
 						<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
                             <em class="fa fa-arrow-left"></em>
@@ -243,7 +243,7 @@ $url_list = UrlManager::get_url_data();
 				<td align="center">
 					<select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
 						<?php
-						foreach($course_list as $course) {
+						foreach ($course_list as $course) {
 							$courseInfo = api_get_course_info_by_id($course['id']);
 							?>
 							<option value="<?php echo $course['id']; ?>"><?php echo $course['title'].' ('.$courseInfo['code'].')'; ?></option>
@@ -258,7 +258,7 @@ $url_list = UrlManager::get_url_data();
 				<td colspan="3" align="center">
 					<br />
 					<?php
-					if(isset($_GET['add']))
+					if (isset($_GET['add']))
 						echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>';
 					else
 						echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>';
diff --git a/main/admin/archive_cleanup.php b/main/admin/archive_cleanup.php
index 4f33d40f08..0df7afd6c9 100755
--- a/main/admin/archive_cleanup.php
+++ b/main/admin/archive_cleanup.php
@@ -16,7 +16,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $form = new FormValidator('archive_cleanup_form', 'post', '', '', array(), FormValidator::LAYOUT_BOX);
 $form->addButtonSend(get_lang('ArchiveDirCleanupProceedButton'));
diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php
index ce127f39f1..c746b5ef68 100755
--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.php
@@ -26,7 +26,7 @@ if (isset($_POST['activeExtension'])) {
 
 			$rs = Database::query($sql);
 
-			if (Database::affected_rows($rs)>0){
+			if (Database::affected_rows($rs) > 0) {
 				$message = get_lang('ServiceActivated');
 			}
 
@@ -76,18 +76,18 @@ $sql = 'SELECT variable FROM '.$tbl_settings_current.'
 		WHERE variable LIKE "service_%" AND subkey="active" and selected_value="true"';
 
 $rs = Database::query($sql);
-while($row = Database::fetch_array($rs)){
+while ($row = Database::fetch_array($rs)) {
 	$listActiveServices[] = $row['variable'];
 }
 
 // javascript to handle accordion behaviour
 $javascript_message = '';
-if(!empty($message)){
+if (!empty($message)) {
 	$javascript_message = '
 	document.getElementById("message").style.display = "block";
 	var timer = setTimeout(hideMessage, 5000);';
 }
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 var listeDiv;
 var extensionsHeader = new Array();
 var extensionsContent = new Array();
@@ -135,7 +135,7 @@ Display::display_header($nameTool);
 ?>
 <div id="message" style="display: none">
 	<?php
-	if(!empty($message))
+	if (!empty($message))
 		Display::display_normal_message($message)
 	?>
 </div>
diff --git a/main/admin/course_intro_pdf_import.php b/main/admin/course_intro_pdf_import.php
index f570491bb0..695a9f9ad8 100755
--- a/main/admin/course_intro_pdf_import.php
+++ b/main/admin/course_intro_pdf_import.php
@@ -89,26 +89,26 @@ function import_pdfs($file, $subDir = '/')
 {
     $baseDir = api_get_path(SYS_ARCHIVE_PATH);
     $uploadPath = 'pdfimport/';
-    $errors = array ();
+    $errors = array();
     if (!is_dir($baseDir.$uploadPath)) {
         @mkdir($baseDir.$uploadPath);
     }
-    if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024*1024*1024)) {
+    if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024 * 1024 * 1024)) {
         error_log('Could not unzip uploaded file in '.__FILE__.', line '.__LINE__);
         return $errors;
     }
     $list = scandir($baseDir.$uploadPath);
     $i = 0;
     foreach ($list as $file) {
-        if (substr($file,0,1) == '.' or !is_file($baseDir.$uploadPath.$file)) {
+        if (substr($file, 0, 1) == '.' or !is_file($baseDir.$uploadPath.$file)) {
             continue;
         }
-        $parts = preg_split('/_/',$file);
+        $parts = preg_split('/_/', $file);
         $course = api_get_course_info($parts[0]);
         if (count($course) > 0) {
             // Build file info because handle_uploaded_document() needs it (name, type, size, tmp_name)
             $fileSize = filesize($baseDir.$uploadPath.$file);
-            $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2],0,-4));
+            $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2], 0, -4));
             if ($docId > 0) {
                 if (!is_file($baseDir.$uploadPath.$file)) {
                     error_log($baseDir.$uploadPath.$file.' does not exists in '.__FILE__);
diff --git a/main/admin/course_list.php b/main/admin/course_list.php
index 7a8c900f32..feed496c5c 100755
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
@@ -26,7 +26,7 @@ function get_number_of_courses()
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
         $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course
+        $sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
                  ON (c.id = url_rel_course.c_id)";
     }
 
@@ -62,7 +62,7 @@ function get_number_of_courses()
     if ((api_is_platform_admin() || api_is_session_admin()) &&
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
-        $sql.= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id();
+        $sql .= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id();
     }
 
     $res = Database::query($sql);
@@ -101,7 +101,7 @@ function get_course_data($from, $number_of_items, $column, $direction)
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
         $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course
+        $sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
                  ON (course.id = url_rel_course.c_id)";
     }
 
@@ -136,7 +136,7 @@ function get_course_data($from, $number_of_items, $column, $direction)
     if ((api_is_platform_admin() || api_is_session_admin()) &&
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
-        $sql.= " AND url_rel_course.access_url_id=".api_get_current_access_url_id();
+        $sql .= " AND url_rel_course.access_url_id=".api_get_current_access_url_id();
     }
 
     $sql .= " ORDER BY col$column $direction ";
@@ -206,13 +206,13 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
 
     if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
         $sessionId = intval($_GET['session_id']);
-        $sql.= " WHERE s.id = ".$sessionId;
+        $sql .= " WHERE s.id = ".$sessionId;
     }
 
     $sql .= " ORDER BY col$column $direction ";
     $sql .= " LIMIT $from,$number_of_items";
     $res = Database::query($sql);
-    $courses = array ();
+    $courses = array();
     while ($course = Database::fetch_array($res)) {
         // Place colour icons in front of courses.
         $show_visual_code = $course['visual_code'] != $course[2] ? Display::label($course['visual_code'], 'info') : null;
@@ -254,7 +254,7 @@ function modify_courses_filter($code)
  */
 function get_course_visibility_icon($v) {
     $style = 'margin-bottom:0;margin-right:5px;';
-    switch($v) {
+    switch ($v) {
         case 0:
             return Display::return_icon('bullet_red.png', get_lang('CourseVisibilityClosed'), array('style' => $style));
             break;
@@ -341,7 +341,7 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
     $form->setDefaults($defaults);
     $content .= $form->returnForm();
 } else {
-    $interbreadcrumb[] = array ('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
     $tool_name = get_lang('CourseList');
     if (isset($_GET['delete_course'])) {
         CourseManager::delete_course($_GET['delete_course']);
@@ -353,7 +353,7 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
     $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
     $form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword'));
     $form->addButtonSearch(get_lang('SearchCourse'));
-    $advanced = '<a class="btn btn-default" href="'.  api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></em> '.get_lang('AdvancedSearch').'</a>';
+    $advanced = '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></em> '.get_lang('AdvancedSearch').'</a>';
 
     // Create a filter by session
     $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
@@ -374,10 +374,10 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
     $courseListUrl = api_get_self();
     $actions .= '<div class="row">';
     $actions .= '<div class="col-md-2">';
-    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'), '', ICON_SIZE_MEDIUM).'</a> ';
     if (api_get_setting('course_validation') === 'true') {
         $actions .= '<a href="course_request_review.php">'.
-            Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     $actions .= '</div>';
     $actions .= '<div class="col-md-4">';
@@ -415,10 +415,10 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
         $table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2, 20, 'ASC', 'course-list');
     }
 
-    $parameters=array();
+    $parameters = array();
 
     if (isset ($_GET['keyword'])) {
-        $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+        $parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
     } elseif (isset ($_GET['keyword_code'])) {
         $parameters['keyword_code'] = Security::remove_XSS($_GET['keyword_code']);
         $parameters['keyword_title'] = Security::remove_XSS($_GET['keyword_title']);
diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 375e7da309..3412049c30 100755
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -87,7 +87,7 @@ function get_request_data($from, $number_of_items, $column, $direction)
     $from = intval($from);
     $number_of_items = intval($number_of_items);
     $column = intval($column);
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
                 id AS col0,
diff --git a/main/admin/extra_field_options.php b/main/admin/extra_field_options.php
index 5bdcaed70f..93e1811be8 100755
--- a/main/admin/extra_field_options.php
+++ b/main/admin/extra_field_options.php
@@ -18,7 +18,7 @@ api_protect_admin_script();
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $tool_name = null;
 
@@ -39,23 +39,23 @@ $check = Security::check_token('request');
 $token = Security::get_token();
 
 if ($action == 'add') {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName);
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']);
-    $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName);
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']);
+    $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
 } elseif ($action == 'edit') {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName);
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']);
-    $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName);
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']);
+    $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
 
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 } else {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName);
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName);
+    $interbreadcrumb[] = array(
         'url' =>  'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],
         'name' => $extra_field_info['display_text']
     );
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditExtraFieldOptions'));
 }
 
 //jqgrid will use this URL to do the selects
@@ -108,12 +108,12 @@ $extra_params['height'] = 'auto';
 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
     '\';
  }';
 
-$htmlHeadXtra[]='<script>
+$htmlHeadXtra[] = '<script>
 $(function() {
     // grid definition see the $obj->display() function
     '.Display::grid_js(
diff --git a/main/admin/ldap_import_students_to_session.php b/main/admin/ldap_import_students_to_session.php
index 12a8f54d0b..73c588b095 100755
--- a/main/admin/ldap_import_students_to_session.php
+++ b/main/admin/ldap_import_students_to_session.php
@@ -9,7 +9,7 @@
  * Code
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once('../inc/global.inc.php');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -17,11 +17,11 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -64,7 +64,7 @@ if (empty($annee) && empty($id_session))
 		echo '</div>';
 
 }
-elseif(!empty($annee) && empty($id_session))
+elseif (!empty($annee) && empty($id_session))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -75,14 +75,14 @@ elseif(!empty($annee) && empty($id_session))
 	echo '<select name="id_session">';
 
 	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
+	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ".
 		" FROM $tbl_session ".
 		" ORDER BY name";
 	$result = Database::query($sql);
 
-	$sessions=Database::store_result($result);
-	$nbr_results=count($sessions);
-	foreach($sessions as $row) {
+	$sessions = Database::store_result($result);
+	$nbr_results = count($sessions);
+	foreach ($sessions as $row) {
 		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
 	}
 	echo '</select>';
@@ -114,7 +114,7 @@ elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		for ($key = 0; $key < $info["count"]; $key++) {
 			$nom_form[] = $info[$key]["sn"][0];
 			$prenom_form[] = $info[$key]["givenname"][0];
 			$email_form[] = $info[$key]["mail"][0];
@@ -134,7 +134,7 @@ elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -145,24 +145,24 @@ elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$id = $_POST['username_form'];
+	$UserList = array();
 	$userid_match_login = array();
 	foreach ($id as $form_index=>$user_id)
 	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['id_session'])) {
 		$num = 0;
 		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
+		$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 		foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
@@ -177,7 +177,7 @@ elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
                     }
 		}
 
-		if($num>0) {
+		if ($num > 0) {
 			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
 			$res = Database::query($sql);
 		}
@@ -205,8 +205,8 @@ elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$message = get_lang('NoUserAdded');
+		Display :: display_normal_message($message, false);
 	}
 	echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
diff --git a/main/admin/skills_wheel.php b/main/admin/skills_wheel.php
index dd8811e3aa..ef939dfe17 100755
--- a/main/admin/skills_wheel.php
+++ b/main/admin/skills_wheel.php
@@ -37,7 +37,7 @@ if (isset($_GET['skill_id'])) {
 $url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$load_user";
 $tpl->assign('wheel_url', $url);
 
-$url  = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
+$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
 $tpl->assign('url', $url);
 $tpl->assign('isAdministration', true);
 
diff --git a/main/admin/system_status.php b/main/admin/system_status.php
index 8e340177f8..a0877c3003 100755
--- a/main/admin/system_status.php
+++ b/main/admin/system_status.php
@@ -11,7 +11,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 // User permissions
 api_protect_admin_script();
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 Display :: display_header(get_lang('SystemStatus'));
 $diag = new Diagnoser();
 $diag->show_html();
diff --git a/main/admin/usergroup_export.php b/main/admin/usergroup_export.php
index 30b96fce37..c6e6358e2c 100755
--- a/main/admin/usergroup_export.php
+++ b/main/admin/usergroup_export.php
@@ -13,8 +13,8 @@ api_protect_admin_script();
 
 $tool_name = get_lang('Export');
 
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'usergroups.php', 'name' => get_lang('Classes'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
 
 set_time_limit(0);
 
diff --git a/main/attendance/attendance_edit.php b/main/attendance/attendance_edit.php
index aa5979d0dd..5e8e7e7768 100755
--- a/main/attendance/attendance_edit.php
+++ b/main/attendance/attendance_edit.php
@@ -12,7 +12,7 @@ api_protect_course_script(true);
 
 // error messages
 if (isset($error)) {
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 if (!isset($error)) {
@@ -49,18 +49,18 @@ $form->addHtmlEditor(
 if (Gradebook::is_active()) {
     if (!empty($attendance_qualify_title) || !empty($attendance_weight)) {
         $form->addButtonAdvancedSettings('id_qualify');
-        $form->addElement('html','<div id="id_qualify_options" style="display:block">');
+        $form->addElement('html', '<div id="id_qualify_options" style="display:block">');
         $form->addElement(
             'checkbox',
             'attendance_qualify_gradebook',
             '',
             get_lang('QualifyAttendanceGradebook'),
-            array('checked'=>'true','onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}')
+            array('checked'=>'true', 'onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}')
         );
-        $form->addElement('html','<div id="options_field" style="display:block">');
+        $form->addElement('html', '<div id="options_field" style="display:block">');
     } else {
         $form->addButtonAdvancedSettings('id_qualify');
-        $form->addElement('html','<div id="id_qualify_options" style="display:none">');
+        $form->addElement('html', '<div id="id_qualify_options" style="display:none">');
         $form->addElement(
             'checkbox',
             'attendance_qualify_gradebook',
@@ -68,7 +68,7 @@ if (Gradebook::is_active()) {
             get_lang('QualifyAttendanceGradebook'),
             'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'
         );
-        $form->addElement('html','<div id="options_field" style="display:none">');
+        $form->addElement('html', '<div id="options_field" style="display:none">');
     }
     GradebookUtils::load_gradebook_select_in_tool($form);
     $form->addElement('text', 'attendance_qualify_title', get_lang('TitleColumnGradebook'));
diff --git a/main/auth/shibboleth/test/shibboleth_test.class.php b/main/auth/shibboleth/test/shibboleth_test.class.php
index 138ca79639..5c10ea2146 100755
--- a/main/auth/shibboleth/test/shibboleth_test.class.php
+++ b/main/auth/shibboleth/test/shibboleth_test.class.php
@@ -205,7 +205,7 @@ class ShibbolethTest
             $message = "Assert failed $message <br/>";
             echo $message;
             // Dump variable for debug
-            error_log(print_r(debug_backtrace(),1));
+            error_log(print_r(debug_backtrace(), 1));
             die;
         }
         else
diff --git a/main/blog/blog.php b/main/blog/blog.php
index 243b07e7bb..40a99c59f4 100755
--- a/main/blog/blog.php
+++ b/main/blog/blog.php
@@ -21,7 +21,7 @@ $current_course_tool = TOOL_BLOGS;
 api_protect_course_script(true);
 
 $lib_path = api_get_path(LIBRARY_PATH);
-$blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
 $nameTools  = get_lang('Blogs');
 $DaysShort  = api_get_week_days_short();
@@ -134,7 +134,7 @@ if (!empty($_POST['new_task_execution_submit'])) {
 		$safe_comment_title,
 		$safe_comment_text,
 		$blog_id,
-		(int)$_GET['post_id'],
+		(int) $_GET['post_id'],
 		$_POST['comment_parent_id'],
 		$_POST['task_id']
 	);
@@ -146,29 +146,29 @@ if (!empty($_POST['new_task_execution_submit'])) {
 if (!empty($_POST['register'])) {
 	if (is_array($_POST['user'])) {
 		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
+			Blog :: set_user_subscribed((int) $_GET['blog_id'], $user_id);
 		}
 	}
 }
 if (!empty($_POST['unregister'])) {
 	if (is_array($_POST['user'])) {
 		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
+			Blog :: set_user_unsubscribed((int) $_GET['blog_id'], $user_id);
 		}
 	}
 }
 if (!empty($_GET['register'])) {
-	Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+	Blog :: set_user_subscribed((int) $_GET['blog_id'], (int) $_GET['user_id']);
 	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
 	$flag = 1;
 }
 if (!empty($_GET['unregister'])) {
-	Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+	Blog :: set_user_unsubscribed((int) $_GET['blog_id'], (int) $_GET['user_id']);
 }
 
 if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
 	if (isset($_GET['do']) && $_GET['do'] == 'delete') {
-		Blog :: delete_task($blog_id, (int)$_GET['task_id']);
+		Blog :: delete_task($blog_id, (int) $_GET['task_id']);
 		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
 	}
 
@@ -181,9 +181,9 @@ if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
 if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
 	$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
 
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
+	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') {
 		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
-			Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
+			Blog :: delete_comment($blog_id, (int) $_GET['post_id'], (int) $_GET['comment_id']);
 			$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
 		} else {
 			$error = true;
@@ -191,9 +191,9 @@ if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
 		}
 	}
 
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
+	if (isset($_GET['do']) && $_GET['do'] == 'delete_article') {
 		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
-			Blog :: delete_post($blog_id, (int)$_GET['article_id']);
+			Blog :: delete_post($blog_id, (int) $_GET['article_id']);
 			$action = ''; // Article is gone, go to blog home
 			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
 		} else {
@@ -204,13 +204,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
 	if (isset($_GET['do']) && $_GET['do'] == 'rate') {
 		if (isset($_GET['type']) && $_GET['type'] == 'post') {
 			if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
-				Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
+				Blog :: add_rating('post', $blog_id, (int) $_GET['post_id'], (int) $_GET['rating']);
 				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
 			}
 		}
 		if (isset($_GET['type']) && $_GET['type'] == 'comment') {
 			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
-				Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
+				Blog :: add_rating('comment', $blog_id, (int) $_GET['comment_id'], (int) $_GET['rating']);
 				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
 			}
 		}
@@ -289,16 +289,16 @@ if (!empty($return_message)) {
 echo '<div class=actions>';
 ?>
 	<a href="<?php echo api_get_self(); ?>?blog_id=<?php echo $blog_id ?>&<?php echo api_get_cidreq(); ?>" title="<?php echo get_lang('Home') ?>">
-    <?php echo Display::return_icon('blog.png', get_lang('Home'),'',ICON_SIZE_MEDIUM); ?></a>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?>
+    <?php echo Display::return_icon('blog.png', get_lang('Home'), '', ICON_SIZE_MEDIUM); ?></a>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=new_post&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('NewPost') ?>">
-    <?php echo Display::return_icon('new_article.png', get_lang('NewPost'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?>
+    <?php echo Display::return_icon('new_article.png', get_lang('NewPost'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=manage_tasks&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageTasks') ?>">
-    <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?>
+    <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=manage_members&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageMembers') ?>">
-    <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
+    <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
 <?php
 echo '</div>';
 
@@ -315,8 +315,8 @@ Display::display_introduction_section(TOOL_BLOGS);
             <div class="panel-heading"><?php echo get_lang('Calendar') ?></div>
             <div class="panel-body">
                 <?php
-                    $month = isset($_GET['month']) ? (int)$_GET['month'] : (int) date('m');
-                    $year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
+                    $month = isset($_GET['month']) ? (int) $_GET['month'] : (int) date('m');
+                    $year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
                     Blog::display_minimonthcalendar($month, $year, $blog_id);
                 ?>
             </div>
@@ -362,7 +362,7 @@ $user_task = false;
 $course_id = api_get_course_int_id();
 
 if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
-	$task_id = (int)$_GET['task_id'];
+	$task_id = (int) $_GET['task_id'];
 } else {
 	$task_id = 0;
 	$tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
diff --git a/main/calendar/ical_export.php b/main/calendar/ical_export.php
index bb7f20c502..80fe8cbb04 100755
--- a/main/calendar/ical_export.php
+++ b/main/calendar/ical_export.php
@@ -45,9 +45,9 @@ if (!empty($event)) {
 	define('ICAL_LANG', api_get_language_isocode());
 
     $ical = new vcalendar();
-    $ical->setConfig('unique_id',api_get_path(WEB_PATH));
-    $ical->setProperty( 'method', 'PUBLISH' );
-    $ical->setConfig('url',api_get_path(WEB_PATH));
+    $ical->setConfig('unique_id', api_get_path(WEB_PATH));
+    $ical->setProperty('method', 'PUBLISH');
+    $ical->setConfig('url', api_get_path(WEB_PATH));
     $vevent = new vevent();
 
     switch ($_GET['class']) {
diff --git a/main/course_description/add.php b/main/course_description/add.php
index 5ad674ccf8..9294e20f6a 100755
--- a/main/course_description/add.php
+++ b/main/course_description/add.php
@@ -11,26 +11,26 @@
 api_protect_course_script(true);
 
 // display categories
-$categories = array ();
+$categories = array();
 foreach ($default_description_titles as $id => $title) {
     $categories[$id] = $title;
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-$i=1;
+$i = 1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+	Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
 	'</a>';
 ksort($categories);
 foreach ($categories as $id => $title) {
     if ($i == ADD_BLOCK) {
         echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-            Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
         break;
     } else {
         echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
         $i++;
     }
 }
diff --git a/main/course_description/edit.php b/main/course_description/edit.php
index 55eb7b4820..cac9ac2fae 100755
--- a/main/course_description/edit.php
+++ b/main/course_description/edit.php
@@ -34,21 +34,21 @@ foreach ($default_description_titles as $id => $title) {
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-$i=1;
+$i = 1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
 	'</a>';
 
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i==ADD_BLOCK) {
+	if ($i == ADD_BLOCK) {
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		break;
 	} else {
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		$i++;
 	}
 }
@@ -56,7 +56,7 @@ echo '</div>';
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 // default header title form
diff --git a/main/course_description/listing.php b/main/course_description/listing.php
index 7f1c079f24..1391ea7db5 100755
--- a/main/course_description/listing.php
+++ b/main/course_description/listing.php
@@ -11,18 +11,18 @@
 api_protect_course_script(true);
 
 // display actions menu
-if (api_is_allowed_to_edit(null,true)) {
+if (api_is_allowed_to_edit(null, true)) {
     $categories = array();
     foreach ($default_description_titles as $id => $title) {
         $categories[$id] = $title;
     }
     $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-	$i=1;
+	$i = 1;
 	echo '<div class="actions" style="margin-bottom:30px">';
 	ksort($categories);
 	foreach ($categories as $id => $title) {
-		if ($i==ADD_BLOCK) {
+		if ($i == ADD_BLOCK) {
 			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
                 Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 			break;
@@ -43,7 +43,7 @@ if ($history) {
             <tr>
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
                 <td align="right"><a href="index.php?action=listing">'.
-                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
+                Display::return_icon('info.png', get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'), ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
 }
 
 $user_info = api_get_user_info();
@@ -52,21 +52,21 @@ if (isset($descriptions) && count($descriptions) > 0) {
 	foreach ($descriptions as $id => $description) {
         if (!empty($description)) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true) && !$history) {
+            if (api_is_allowed_to_edit(null, true) && !$history) {
                 if (api_get_session_id() == $description['session_id']) {
                     $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
 
                     // delete
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
-                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
+                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
+                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
                     $actions .= '</a> ';
 
                     // edit
                     $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=edit&description_type='.$description['description_type'].'">';
-                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
+                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
                     $actions .= '</a> ';
                 } else {
-                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
+                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
                 }
             }
             echo Display::panel(
diff --git a/main/course_progress/thematic_plan.php b/main/course_progress/thematic_plan.php
index f68e0da4ef..84b7071bcf 100755
--- a/main/course_progress/thematic_plan.php
+++ b/main/course_progress/thematic_plan.php
@@ -10,7 +10,7 @@
 // actions menu
 $new_thematic_plan_data = array();
 if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+foreach ($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
@@ -25,7 +25,7 @@ if (!empty($thematic_simple_list)) {
     }
 }
 
-$i=1;
+$i = 1;
 
 echo Display::tag('h2', $thematic_data['title']);
 echo $thematic_data['content'];
@@ -75,8 +75,8 @@ if ($action === 'thematic_plan_list') {
             $thematic_plan = null;
         } else {
             $thematic_plan = null;
-            $default['title['.$id.']']       = $title;
-            $default['description['.$id.']']= '';
+            $default['title['.$id.']'] = $title;
+            $default['description['.$id.']'] = '';
         }
         $form->setDefaults($default);
     }
diff --git a/main/forum/newthread.php b/main/forum/newthread.php
index d795bd6fc2..c815b25aad 100755
--- a/main/forum/newthread.php
+++ b/main/forum/newthread.php
@@ -51,12 +51,12 @@ $current_forum_category = get_forumcategory_information($current_forum['forum_ca
 
 /* Breadcrumbs */
 
-if (isset($_SESSION['gradebook'])){
+if (isset($_SESSION['gradebook'])) {
     $gradebook = Security::remove_XSS($_SESSION['gradebook']);
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
         'name' => get_lang('ToolGradebook')
     );
@@ -114,7 +114,7 @@ if (!empty($groupId)) {
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.$cidreq, 'name' => get_lang('Groups'));
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.$cidreq, 'name' => get_lang('GroupSpace').' '.$groupProperties['name']);
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?'.$cidreq.'&forum='.intval($_GET['forum']), 'name' => $current_forum['forum_title']);
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/newthread.php?'.$cidreq.'&forum='.intval($_GET['forum']),'name' => get_lang('NewTopic'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/newthread.php?'.$cidreq.'&forum='.intval($_GET['forum']), 'name' => get_lang('NewTopic'));
 } else {
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/index.php?'.$cidreq, 'name' => $nameTools);
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforumcategory.php?'.$cidreq.'&forumcategory='.$current_forum_category['cat_id'], 'name' => $current_forum_category['cat_title']);
diff --git a/main/gradebook/gradebook_add_link.php b/main/gradebook/gradebook_add_link.php
index e44644a9b7..ff50899193 100755
--- a/main/gradebook/gradebook_add_link.php
+++ b/main/gradebook/gradebook_add_link.php
@@ -14,7 +14,7 @@ api_block_anonymous_users();
 GradebookUtils::block_students();
 
 $courseCode = isset($_GET['course_code']) ? Security::remove_XSS($_GET['course_code']) : null;
-$selectCat =  isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : 0;
+$selectCat = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : 0;
 
 $course_info = api_get_course_info($courseCode);
 $tbl_forum_thread = Database :: get_course_table(TABLE_FORUM_THREAD);
diff --git a/main/gradebook/lib/be/linkfactory.class.php b/main/gradebook/lib/be/linkfactory.class.php
index 2b4a540c43..b7dcf6139d 100755
--- a/main/gradebook/lib/be/linkfactory.class.php
+++ b/main/gradebook/lib/be/linkfactory.class.php
@@ -58,7 +58,7 @@ class LinkFactory
      * @param string $name_mask search string
      * @return array link objects matching the search criterium
      */
-    public function find_links($name_mask,$selectcat)
+    public function find_links($name_mask, $selectcat)
     {
         return AbstractLink::find_links($name_mask, $selectcat);
     }
@@ -98,7 +98,7 @@ class LinkFactory
     public static function get_all_types()
     {
         //LINK_DROPBOX,
-        return array (
+        return array(
             LINK_EXERCISE,
             //LINK_DROPBOX,
             LINK_HOTPOTATOES,
diff --git a/main/gradebook/lib/fe/usertable.class.php b/main/gradebook/lib/fe/usertable.class.php
index ff3d125c57..4e7609ff63 100755
--- a/main/gradebook/lib/fe/usertable.class.php
+++ b/main/gradebook/lib/fe/usertable.class.php
@@ -87,8 +87,8 @@ class UserTable extends SortableTable
         // generate the data to display
         $sortable_data = array();
         foreach ($data_array as $data) {
-            if ($data[2]!="") {//filter by course removed
-                $row = array ();
+            if ($data[2] != "") {//filter by course removed
+                $row = array();
                 $row[] = $this->build_type_column($data[0]);
                 $row[] = $this->build_name_link($data[0]);
                 $row[] = $data[2];
@@ -124,15 +124,15 @@ class UserTable extends SortableTable
             // evaluation
             case 'E':
                 return '&nbsp;'
-                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+                . '<a href="gradebook_view_result.php?selecteval='.$item->get_id().'">'
                 . $item->get_name()
                 . '</a>';
             // link
             case 'L':
-                return '&nbsp;<a href="' . $item->get_link() . '">'
+                return '&nbsp;<a href="'.$item->get_link().'">'
                 . $item->get_name()
                 . '</a>'
-                . '&nbsp;[' . $item->get_type_name() . ']';
+                . '&nbsp;['.$item->get_type_name().']';
         }
     }
 }
diff --git a/main/inc/ajax/link.ajax.php b/main/inc/ajax/link.ajax.php
index f9f924123a..89e53776bf 100755
--- a/main/inc/ajax/link.ajax.php
+++ b/main/inc/ajax/link.ajax.php
@@ -24,7 +24,7 @@ switch ($action) {
             // set URL and other appropriate options
             $defaults = array(
                 CURLOPT_URL => $url,
-                CURLOPT_FOLLOWLOCATION => true,         // follow redirects accept youtube.com
+                CURLOPT_FOLLOWLOCATION => true, // follow redirects accept youtube.com
                 CURLOPT_HEADER => 0,
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_TIMEOUT => 4
diff --git a/main/inc/ajax/session.ajax.php b/main/inc/ajax/session.ajax.php
index b648aa7343..48f07b945e 100755
--- a/main/inc/ajax/session.ajax.php
+++ b/main/inc/ajax/session.ajax.php
@@ -15,7 +15,7 @@ switch ($action) {
             $list_sessions = SessionManager::get_sessions_by_user($user_id, true);
             if (!empty($list_sessions)) {
                 foreach ($list_sessions as $session_item) {
-                    echo $session_item['session_name'] . '<br />';
+                    echo $session_item['session_name'].'<br />';
                 }
             } else {
                 echo get_lang('NoSessionsForThisUser');
@@ -29,7 +29,7 @@ switch ($action) {
                 [
                     's.name' => [
                         'operator' => 'LIKE',
-                        'value' => "%" . $_REQUEST['q'] . "%"
+                        'value' => "%".$_REQUEST['q']."%"
                     ]
                 ]
             );
diff --git a/main/inc/lib/AnnouncementEmail.php b/main/inc/lib/AnnouncementEmail.php
index e9cb2e2095..561c4470f0 100644
--- a/main/inc/lib/AnnouncementEmail.php
+++ b/main/inc/lib/AnnouncementEmail.php
@@ -203,7 +203,7 @@ class AnnouncementEmail
      *
      * @return array
      */
-    public function sender($key = '',  $userId = '')
+    public function sender($key = '', $userId = '')
     {
         $_user = api_get_user_info($userId);
 
diff --git a/main/inc/lib/add_courses_to_session_functions.lib.php b/main/inc/lib/add_courses_to_session_functions.lib.php
index 53cfef5d31..c2e5117f02 100755
--- a/main/inc/lib/add_courses_to_session_functions.lib.php
+++ b/main/inc/lib/add_courses_to_session_functions.lib.php
@@ -21,7 +21,7 @@ class AddCourseToSession
 		$course_title = null;
 		$xajax_response = new xajaxResponse();
 		$return = '';
-		if(!empty($needle) && !empty($type)) {
+		if (!empty($needle) && !empty($type)) {
 			// xajax send utf8 datas... datas in db can be non-utf8 datas
 			$charset = api_get_system_encoding();
 			$needle = api_convert_encoding($needle, $charset, 'utf-8');
@@ -38,7 +38,7 @@ class AddCourseToSession
 					while ($row = Database::fetch_row($res)) {
 						$course_codes .= '\''.$row[0].'\',';
 					}
-					$course_codes = substr($course_codes,0,(strlen($course_codes)-1));
+					$course_codes = substr($course_codes, 0, (strlen($course_codes) - 1));
 
 					$cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
 				}
@@ -69,9 +69,9 @@ class AddCourseToSession
 			if (api_is_multiple_url_enabled()) {
 				$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 				$access_url_id = api_get_current_access_url_id();
-				if ($access_url_id != -1){
+				if ($access_url_id != -1) {
 
-					if ($type=='single') {
+					if ($type == 'single') {
 						$sql = 'SELECT
                                     course.id,
 						            course.visual_code,
@@ -104,19 +104,19 @@ class AddCourseToSession
             if ($type == 'single') {
 				while ($course = Database :: fetch_array($rs)) {
 					$course_list[] = $course['code'];
-					$course_title=str_replace("'","\'",$course_title);
+					$course_title = str_replace("'", "\'", $course_title);
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['id'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />';
 				}
-				$xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return));
+				$xajax_response -> addAssign('ajax_list_courses_single', 'innerHTML', api_utf8_encode($return));
 			} else {
 				$return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
-				while($course = Database :: fetch_array($rs)) {
+				while ($course = Database :: fetch_array($rs)) {
 					$course_list[] = $course['code'];
-					$course_title=str_replace("'","\'",$course_title);
-                    $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')',ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';
+					$course_title = str_replace("'", "\'", $course_title);
+                    $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')', ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';
 				}
 				$return .= '</select>';
-				$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+				$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 			}
 		}
 		$_SESSION['course_list'] = $course_list;
diff --git a/main/inc/lib/extra_field_option.lib.php b/main/inc/lib/extra_field_option.lib.php
index 30f113f871..80aacf7fde 100755
--- a/main/inc/lib/extra_field_option.lib.php
+++ b/main/inc/lib/extra_field_option.lib.php
@@ -216,7 +216,7 @@ class ExtraFieldOption extends Model
 
                         foreach ($sub_options as $sub_option) {
                             if (!empty($sub_option)) {
-                                $new_params  = array(
+                                $new_params = array(
                                     'field_id' => $field_id,
                                     'option_value' => $sub_id,
                                     'display_text' => $sub_option,
@@ -660,7 +660,7 @@ class ExtraFieldOption extends Model
         $form->addElement('hidden', 'field_id', $this->field_id);
 
         if ($action == 'edit') {
-            $translateUrl = api_get_path(WEB_CODE_PATH) . 'extrafield/translate.php?' . http_build_query([
+            $translateUrl = api_get_path(WEB_CODE_PATH).'extrafield/translate.php?'.http_build_query([
                 'extra_field_option' => $id
             ]);
             $translateButton = Display::toolbarButton(get_lang('TranslateThisTerm'), $translateUrl, 'language', 'link');
diff --git a/main/inc/lib/lp_item.lib.php b/main/inc/lib/lp_item.lib.php
index cc31e931a3..a0fbf31ad8 100755
--- a/main/inc/lib/lp_item.lib.php
+++ b/main/inc/lib/lp_item.lib.php
@@ -36,7 +36,7 @@ class LpItem
 
     public function __construct($in_c_id = 0, $in_id = 0)
     {
-        if ($in_c_id > 0 && $in_id >0) {
+        if ($in_c_id > 0 && $in_id > 0) {
             $item_view_table = Database::get_course_table(TABLE_LP_ITEM);
             $sql = "SELECT * FROM $item_view_table
                     WHERE
diff --git a/main/inc/lib/security.lib.php b/main/inc/lib/security.lib.php
index 5e9004fd69..6509200f47 100755
--- a/main/inc/lib/security.lib.php
+++ b/main/inc/lib/security.lib.php
@@ -93,7 +93,7 @@ class Security
             $rel_path = '/'.$rel_path;
         }
         $abs_path = $current_path.$rel_path;
-        $true_path=str_replace("\\", '/', realpath($abs_path));
+        $true_path = str_replace("\\", '/', realpath($abs_path));
         $found = strpos($true_path.'/', $checker_path);
         if ($found === 0) {
             return true;
@@ -278,7 +278,7 @@ class Security
         }
 
         if ($user_status == COURSEMANAGERLOWSECURITY) {
-            return $var;  // No filtering.
+            return $var; // No filtering.
         }
 
         static $purifier = array();
@@ -301,7 +301,7 @@ class Security
             }
 
             // Shows _target attribute in anchors
-            $config->set('Attr.AllowedFrameTargets', array('_blank','_top','_self', '_parent'));
+            $config->set('Attr.AllowedFrameTargets', array('_blank', '_top', '_self', '_parent'));
 
             if ($user_status == STUDENT) {
                 global $allowed_html_student;
diff --git a/main/lp/aiccItem.class.php b/main/lp/aiccItem.class.php
index 128e2dc2f9..071062e1bb 100755
--- a/main/lp/aiccItem.class.php
+++ b/main/lp/aiccItem.class.php
@@ -117,7 +117,7 @@ class aiccItem extends learnpathItem
         $abs_order++;
         $i = 1;
         foreach ($this->sub_items as $id => $dummy) {
-            $oSubitem =& $this->sub_items[$id];
+            $oSubitem = & $this->sub_items[$id];
             $oSubitem->get_flat_list($list, $abs_order, $i, $level + 1);
             $i++;
         }
diff --git a/main/lp/blank.php b/main/lp/blank.php
index 15be9f1895..52c8d67efa 100755
--- a/main/lp/blank.php
+++ b/main/lp/blank.php
@@ -19,7 +19,7 @@ body { background: none;}
 Display::display_reduced_header();
 
 if (isset($_GET['error'])) {
-    switch ($_GET['error']){
+    switch ($_GET['error']) {
         case 'document_deleted':
             echo '<br /><br />';
             Display::display_error_message(get_lang('DocumentHasBeenDeleted'));
diff --git a/main/lp/lp_ajax_save_item.php b/main/lp/lp_ajax_save_item.php
index 35c9193d41..58aa41e438 100755
--- a/main/lp/lp_ajax_save_item.php
+++ b/main/lp/lp_ajax_save_item.php
@@ -163,7 +163,7 @@ function save_item(
         // Set status to completed for hotpotatoes if score > 80%.
         if ($my_type == 'hotpotatoes') {
             if ((empty($status) || $status == 'undefined' || $status == 'not attempted') && $max > 0) {
-                if (($score/$max) > 0.8) {
+                if (($score / $max) > 0.8) {
                     $myStatus = 'completed';
                     if ($debug > 1) {
                         error_log('Calling set_status('.$myStatus.') for hotpotatoes', 0);
@@ -174,7 +174,7 @@ function save_item(
                         error_log('Done calling set_status for hotpotatoes - now '.$myLPI->get_status(false), 0);
                     }
                 }
-            } elseif ($status == 'completed' && $max > 0 && ($score/$max) < 0.8) {
+            } elseif ($status == 'completed' && $max > 0 && ($score / $max) < 0.8) {
                 $myStatus = 'failed';
                 if ($debug > 1) {
                     error_log('Calling set_status('.$myStatus.') for hotpotatoes', 0);
@@ -367,7 +367,7 @@ function save_item(
             $myLPI->current_data = $suspend;
         }
 
-        if (isset($location) && $location != '' && $location!='undefined') {
+        if (isset($location) && $location != '' && $location != 'undefined') {
             $myLPI->set_lesson_location($location);
         }
 
diff --git a/main/lp/lp_edit_item.php b/main/lp/lp_edit_item.php
index 5229c6b084..e39e375284 100755
--- a/main/lp/lp_edit_item.php
+++ b/main/lp/lp_edit_item.php
@@ -89,7 +89,7 @@ if (isset($_SESSION['gradebook'])) {
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -108,7 +108,7 @@ $interbreadcrumb[] = array(
 $show_learn_path = true;
 $lp_theme_css = $_SESSION['oLP']->get_theme();
 
-Display::display_header(get_lang('Edit'),'Path');
+Display::display_header(get_lang('Edit'), 'Path');
 $suredel = trim(get_lang('AreYouSureToDeleteJS'));
 
 ?>
@@ -166,8 +166,8 @@ echo '<div id="lp_sidebar" class="col-md-4">';
 $path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
 $path_item = Database::escape_string($path_item);
 $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-$sql_doc = "SELECT path FROM " . $tbl_doc . "
-            WHERE c_id = $course_id AND id = '". $path_item."' ";
+$sql_doc = "SELECT path FROM ".$tbl_doc."
+            WHERE c_id = $course_id AND id = '".$path_item."' ";
 
 $res_doc = Database::query($sql_doc);
 $path_file = Database::result($res_doc, 0, 0);
diff --git a/main/lp/lp_subscribe_users.php b/main/lp/lp_subscribe_users.php
index f865590725..11841055b5 100644
--- a/main/lp/lp_subscribe_users.php
+++ b/main/lp/lp_subscribe_users.php
@@ -168,7 +168,7 @@ if ($form->validate()) {
     exit;
 } else {
     $headers = [get_lang('SubscribeUsersToLp'), get_lang('SubscribeGroupsToLp')];
-    $tabs = Display::tabs($headers, [$formUsers->toHtml(),$form->toHtml()]);
+    $tabs = Display::tabs($headers, [$formUsers->toHtml(), $form->toHtml()]);
     $tpl->assign('tabs', $tabs);
 }
 
diff --git a/main/mySpace/course.php b/main/mySpace/course.php
index d26f2e1f26..319ead6f36 100755
--- a/main/mySpace/course.php
+++ b/main/mySpace/course.php
@@ -15,7 +15,7 @@ $this_section = SECTION_TRACKING;
 $sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_session"]) && $_GET["id_session"] != "") {
     $interbreadcrumb[] = array("url" => "session.php", "name" => get_lang('Sessions'));
@@ -63,7 +63,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
             $user_id = intval($_GET['user_id']);
             $user_info = api_get_user_info($user_id);
             $title = get_lang('AssignedCoursesTo').' '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
-            $courses  = CourseManager::get_course_list_of_user_as_course_admin($user_id);
+            $courses = CourseManager::get_course_list_of_user_as_course_admin($user_id);
         } else {
             $title = get_lang('YourCourseList');
             $courses = CourseManager::get_courses_followed_by_drh(api_get_user_id());
@@ -78,7 +78,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
 
     if (!api_is_session_admin()) {
         $menu_items[] = Display::url(
-            Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),
+            Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
         );
         $menu_items[] = Display::url(
diff --git a/main/mySpace/users.php b/main/mySpace/users.php
index 12f4f7b1ea..d399d7a72f 100755
--- a/main/mySpace/users.php
+++ b/main/mySpace/users.php
@@ -20,14 +20,14 @@ api_block_anonymous_users();
 
 $this_section = SECTION_TRACKING;
 
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
-    $interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
+    $interbreadcrumb[] = array("url" => "teachers.php", "name" => get_lang('Teachers'));
 }
 
-if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
-    $interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
+if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
+    $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
 }
 
 function get_count_users()
@@ -163,7 +163,7 @@ function get_users($from, $limit, $column, $direction)
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
         } else {
-            $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
+            $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
         }
         $row[] = $detailsLink;
@@ -184,7 +184,7 @@ $actionsLeft = '';
 
 if (api_is_drh()) {
     $menu_items = array(
-        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ),
+        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"),
         Display::url(Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), '#'),
         Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
         Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),
@@ -240,14 +240,14 @@ $table->set_header(4, get_lang('Details'), false);
 
 if ($export_csv) {
     if ($is_western_name_order) {
-        $csv_header[] = array (
+        $csv_header[] = array(
             get_lang('FirstName'),
             get_lang('LastName'),
             get_lang('FirstLogin'),
             get_lang('LastConnexion')
         );
     } else {
-        $csv_header[] = array (
+        $csv_header[] = array(
             get_lang('LastName'),
             get_lang('FirstName'),
             get_lang('FirstLogin'),
diff --git a/main/session/session_import_drh.php b/main/session/session_import_drh.php
index 2f6fa746a3..e08a2b15c9 100644
--- a/main/session/session_import_drh.php
+++ b/main/session/session_import_drh.php
@@ -16,7 +16,7 @@ $form_sent = 0;
 $tool_name = get_lang('ImportSessionDrhList');
 
 //$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 set_time_limit(0);
 
@@ -27,7 +27,7 @@ Display::display_header($tool_name);
 
 echo '<div class="actions">';
 echo '<a href="../session/session_list.php">'.
-    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (!empty($error_message)) {
diff --git a/main/social/group_add.php b/main/social/group_add.php
index 463b509ad9..dfba2ef6b0 100755
--- a/main/social/group_add.php
+++ b/main/social/group_add.php
@@ -38,9 +38,9 @@ if ($form->validate()) {
 $nameTools = get_lang('AddGroup');
 $this_section = SECTION_SOCIAL;
 
-$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
-$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-$interbreadcrumb[]= array ('url' =>'#','name' => $nameTools);
+$interbreadcrumb[] = array('url' =>'home.php', 'name' => get_lang('Social'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'#', 'name' => $nameTools);
 
 $social_avatar_block = SocialManager::show_social_avatar_block('group_add');
 $social_menu_block = SocialManager::show_social_menu('group_add');
diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php
index 637c70968f..711974c380 100755
--- a/main/social/group_invitation.php
+++ b/main/social/group_invitation.php
@@ -18,7 +18,7 @@ $this_section = SECTION_SOCIAL;
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-$tbl_group_rel_user	= Database::get_main_table(TABLE_USERGROUP_REL_USER);
+$tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
 
 // setting the name of the tool
 $tool_name = get_lang('SubscribeUsersToGroup');
@@ -40,7 +40,7 @@ if (empty($group_id)) {
     }
 }
 
-$interbreadcrumb[] = array('url' =>'groups.php','name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
 $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('SubscribeUsersToGroup'));
 
@@ -74,7 +74,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 
         if (is_array($user_list) && count($user_list) > 0) {
             //send invitation message
-            foreach ($user_list as $user_id){
+            foreach ($user_list as $user_id) {
                 $result = MessageManager::send_message(
                     $user_id,
                     $title,
@@ -110,8 +110,8 @@ if (!$friends) {
 
             if (!isset($group_friend_list[$group_id]) ||
                 isset($group_friend_list[$group_id]) &&
-                $group_friend_list[$group_id]['relation_type'] == '' ) {
-                $Users[$friend['friend_user_id']]= array(
+                $group_friend_list[$group_id]['relation_type'] == '') {
+                $Users[$friend['friend_user_id']] = array(
                     'user_id' => $friend['friend_user_id'],
                     'firstname' => $friend['firstName'],
                     'lastname' => $friend['lastName'],
@@ -120,7 +120,7 @@ if (!$friends) {
                 );
             }
         } else {
-            $Users[$friend['friend_user_id']]= array(
+            $Users[$friend['friend_user_id']] = array(
                 'user_id' => $friend['friend_user_id'],
                 'firstname' =>$friend['firstName'],
                 'lastname' => $friend['lastName'],
@@ -131,7 +131,7 @@ if (!$friends) {
     }
 }
 
-if (is_array($Users) && count($Users) > 0 ) {
+if (is_array($Users) && count($Users) > 0) {
     foreach ($Users as $user) {
         if ($user['group_id'] != $group_id) {
             $nosessionUsersList[$user['user_id']] = api_get_person_name(
@@ -143,7 +143,7 @@ if (is_array($Users) && count($Users) > 0 ) {
 }
 
 $social_left_content = SocialManager::show_social_menu('invite_friends', $group_id);
-$social_right_content =  '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>';
+$social_right_content = '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>';
 
 if (count($nosessionUsersList) == 0) {
     $friends = SocialManager::get_friends(api_get_user_id());
@@ -179,7 +179,7 @@ $members = $usergroup->get_users_by_group(
     array(GROUP_USER_PERMISSION_PENDING_INVITATION)
 );
 
-if (is_array($members) && count($members)>0) {
+if (is_array($members) && count($members) > 0) {
     foreach ($members as &$member) {
         $image = UserManager::getUserPicture($member['id']);
         $member['image'] = '<img class="img-circle" src="'.$image.'"  width="50px" height="50px"  />';
diff --git a/main/survey/ch_multiplechoice.php b/main/survey/ch_multiplechoice.php
index 2f10e19aa7..70bf6c33d6 100644
--- a/main/survey/ch_multiplechoice.php
+++ b/main/survey/ch_multiplechoice.php
@@ -31,7 +31,7 @@ class ch_multiplechoice extends survey_question
             foreach ($formData['answers'] as $key => $value) {
                 $this->getForm()->addHtmlEditor('answers['.$key.']', null, false, false, $config);
 
-                if ($key < $total-1) {
+                if ($key < $total - 1) {
                     //$this->getForm()->addButton("move_down[$key]", get_lang('Down'));
                 }
 
@@ -39,7 +39,7 @@ class ch_multiplechoice extends survey_question
                     //$this->getForm()->addButton("move_up[$key]", get_lang('Up'));
                 }
 
-                if ($total> 2) {
+                if ($total > 2) {
                     $this->getForm()->addButton("delete_answer[$key]", get_lang('Delete'), 'trash', 'danger');
                 }
             }
diff --git a/main/survey/ch_score.php b/main/survey/ch_score.php
index 2a27179638..281cc0c065 100644
--- a/main/survey/ch_score.php
+++ b/main/survey/ch_score.php
@@ -38,7 +38,7 @@ class ch_score extends survey_question
             $options = array(
                 '--' => '--'
             );
-            for ($i=1; $i <= $questionData['maximum_score']; $i++) {
+            for ($i = 1; $i <= $questionData['maximum_score']; $i++) {
                 $options[$i] = $i;
             }
 
diff --git a/main/survey/ch_yesno.php b/main/survey/ch_yesno.php
index 798cdbaff2..17f21a8d0c 100644
--- a/main/survey/ch_yesno.php
+++ b/main/survey/ch_yesno.php
@@ -43,7 +43,7 @@ class ch_yesno extends survey_question
                 $class = 'radio-inline';
             }
 
-            $name = 'question' . $questionData['question_id'];
+            $name = 'question'.$questionData['question_id'];
 
             $form->addRadio(
                 $name,
diff --git a/main/survey/link.php b/main/survey/link.php
index ccd48b6720..737b7068f1 100755
--- a/main/survey/link.php
+++ b/main/survey/link.php
@@ -11,7 +11,7 @@ if (empty($survey_id)) {
 if (!SurveyManager::survey_generation_hash_available()) {
     api_not_allowed(true);
 }
-$course_info  = api_get_course_info_by_id($_REQUEST['c']);
+$course_info = api_get_course_info_by_id($_REQUEST['c']);
 
 $hash_is_valid = SurveyManager::validate_survey_hash(
     $survey_id,
diff --git a/main/ticket/categories.php b/main/ticket/categories.php
index d568240463..eb0f1a1ff2 100644
--- a/main/ticket/categories.php
+++ b/main/ticket/categories.php
@@ -89,7 +89,7 @@ switch ($action) {
         $form = TicketManager::getCategoryForm($url, $projectId);
         $formToString = $form->returnForm();
         if ($form->validate()) {
-            $values =$form->getSubmitValues();
+            $values = $form->getSubmitValues();
 
             $params = [
                 'name' => $values['name'],
@@ -125,7 +125,7 @@ switch ($action) {
         $form->setDefaults($cat);
         $formToString = $form->returnForm();
         if ($form->validate()) {
-            $values =$form->getSubmitValues();
+            $values = $form->getSubmitValues();
 
             $params = [
                 'name' => $values['name'],
diff --git a/main/tracking/course_session_report.php b/main/tracking/course_session_report.php
index e8f3cc2eac..78e24028ed 100755
--- a/main/tracking/course_session_report.php
+++ b/main/tracking/course_session_report.php
@@ -21,7 +21,7 @@ $export_to_xls = false;
 if (isset($_GET['export'])) {
 	$export_to_xls = true;
 }
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -30,15 +30,15 @@ $global = true;
 
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 if (empty($session_id)) {
-	$session_id  = 1;
+	$session_id = 1;
 }
 
-$form = new FormValidator('search_simple','POST','','',null,false);
+$form = new FormValidator('search_simple', 'POST', '', '', null, false);
 
 //Get session list
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
 $my_session_list = array();
-foreach($session_list as $sesion_item) {
+foreach ($session_list as $sesion_item) {
 	$my_session_list[$sesion_item['id']] = $sesion_item['name'];
 }
 if (count($session_list) == 0) {
@@ -70,7 +70,7 @@ if (!$export_to_xls) {
 	}
 	echo '</div>';
 
-	if  (api_is_platform_admin()) {
+	if (api_is_platform_admin()) {
 		echo MySpace::getAdminActions();
 	}
 
@@ -85,7 +85,7 @@ $course_average = $course_average_counter = array();
 $counter = 0;
 $main_result = array();
 //Getting course list
-foreach ($course_list  as $current_course ) {
+foreach ($course_list  as $current_course) {
 	$course_info = api_get_course_info($current_course['code']);
 	$_course = $course_info;
 	$attempt_result = array();
@@ -121,7 +121,7 @@ if (!empty($users) && is_array($users)) {
 
 	$html_result .= '<table  class="data_table">';
 	$html_result .= '<tr><th>'.get_lang('User').'</th>';
-	foreach($course_list as $item ) {
+	foreach ($course_list as $item) {
 		$html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
 	}
 	$html_result .= '<th>'.get_lang('AverageScore').' %</th>';
@@ -129,9 +129,9 @@ if (!empty($users) && is_array($users)) {
 
 	foreach ($users  as $user) {
 		$total_student = 0;
-		$counter ++;
+		$counter++;
 		$s_css_class = 'row_even';
-		if ($counter % 2 ==0 ) {
+		if ($counter % 2 == 0) {
 			$s_css_class = 'row_odd';
 		}
 		$html_result .= "<tr class='$s_css_class'>
@@ -143,12 +143,12 @@ if (!empty($users) && is_array($users)) {
 
 		$counter = 0;
 		$total_result_by_user = 0;
-		foreach ($course_list  as $current_course ) {
+		foreach ($course_list  as $current_course) {
 			$total_course = 0;
 			$html_result .= "<td>";
 
 
-			$result  = '-';
+			$result = '-';
 			if (isset($main_result[$current_course['code']][$user['user_id']])) {
 				$user_info_stat = $main_result[$current_course['code']][$user['user_id']];
 				if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
@@ -160,9 +160,9 @@ if (!empty($users) && is_array($users)) {
 					$total_result_by_user += $result;
 					$course_average[$current_course['code']] += $total_course;
 					$course_average_counter[$current_course['code']]++;
-					$result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
+					$result = $result.' ('.$user_info_stat['attempts'].' '.get_lang(
 							'Attempts'
-						) . ')';
+						).')';
 					$counter++;
 				}
 			}
@@ -173,21 +173,21 @@ if (!empty($users) && is_array($users)) {
 		if (empty($counter)) {
 			$total_student = '-';
 		} else {
-			$total_student = $total_result_by_user/$counter;
-			$total_average_score+=$total_student;
+			$total_student = $total_result_by_user / $counter;
+			$total_average_score += $total_student;
 			$total_average_score_count++;
 		}
-		$string_date=Tracking :: get_last_connection_date($user['user_id'],true);
-		$html_result .="<td>$total_student</td><td>$string_date</td></tr>";
+		$string_date = Tracking :: get_last_connection_date($user['user_id'], true);
+		$html_result .= "<td>$total_student</td><td>$string_date</td></tr>";
 	}
 
-	$html_result .="<tr><th>".get_lang('AverageScore')."</th>";
+	$html_result .= "<tr><th>".get_lang('AverageScore')."</th>";
 	$total_average = 0;
 	$counter = 0;
-	foreach($course_list as $course_item) {
+	foreach ($course_list as $course_item) {
 		if (!empty($course_average_counter[$course_item['code']])) {
 			$average_per_course = round(
-				$course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
+				$course_average[$course_item['code']] / ($course_average_counter[$course_item['code']] * 100) * 100,
 				2
 			);
 		} else {
@@ -197,17 +197,17 @@ if (!empty($users) && is_array($users)) {
 			$counter++;
 		}
 		$total_average = $total_average + $average_per_course;
-		$html_result .="<td>$average_per_course</td>";
+		$html_result .= "<td>$average_per_course</td>";
 	}
 	if (!empty($total_average_score_count)) {
-		$total_average = round($total_average_score/($total_average_score_count*100)*100,2);
+		$total_average = round($total_average_score / ($total_average_score_count * 100) * 100, 2);
 	} else {
 		$total_average = '-';
 	}
 
-	$html_result .='<td>'.$total_average.'</td>';
-	$html_result .="<td>-</td>";
-	$html_result .="</tr>";
+	$html_result .= '<td>'.$total_average.'</td>';
+	$html_result .= "<td>-</td>";
+	$html_result .= "</tr>";
 	$html_result .= '</table>';
 } else {
 	Display::display_warning_message(get_lang('NoResults'));
diff --git a/main/user/class.php b/main/user/class.php
index 2f131ce216..debe1dbcfb 100755
--- a/main/user/class.php
+++ b/main/user/class.php
@@ -146,7 +146,7 @@ Display :: display_header($tool_name, "User");
 $(function() {
 <?php
     // grid definition see the $usergroup>display() function
-    echo Display::grid_js('usergroups',  $url, $columns, $columnModel, $extraParams, array(), '', true);
+    echo Display::grid_js('usergroups', $url, $columns, $columnModel, $extraParams, array(), '', true);
 ?>
 });
 </script>
diff --git a/main/user/classes.php b/main/user/classes.php
index 6261ae19f8..94d8d911e3 100755
--- a/main/user/classes.php
+++ b/main/user/classes.php
@@ -12,9 +12,9 @@ api_block_anonymous_users();
 
 $this_section = SECTION_COURSES;
 
-$interbreadcrumb[]= array ('url' =>'classes.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' =>'classes.php', 'name' => get_lang('Classes'));
 if (isset($_GET['id'])) {
-    $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Groups'));
 }
 
 Display :: display_header($tool_name, 'Classes');
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php
index da86c8ab61..8b1abd56b8 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php
@@ -569,7 +569,7 @@ class CourseBuilder
         $table_doc = Database:: get_course_table(TABLE_DOCUMENT);
 
         if (!empty($courseId) && !empty($session_id)) {
-            $session_id  = intval($session_id);
+            $session_id = intval($session_id);
             if ($with_base_content) {
                 $session_condition = api_get_session_condition(
                     $session_id,
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/CourseSession.php b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/CourseSession.php
index 44b8a475c9..56193f30e5 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/CourseSession.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/CourseSession.php
@@ -18,7 +18,7 @@ class CourseSession extends Resource
      * @param int $id
      * @param string $title
      */
-    public function __construct($id,$title)
+    public function __construct($id, $title)
     {
         parent::__construct($id, RESOURCE_SESSION_COURSE);
         $this->title = $title;
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Glossary.php b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Glossary.php
index d8a97ed963..902e05c1f2 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Glossary.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Glossary.php
@@ -22,9 +22,9 @@ class Glossary extends Resource
      * @param string $description
      * @param int $display_order
      */
-    public function __construct($id,$name,$description,$display_order)
+    public function __construct($id, $name, $description, $display_order)
     {
-        parent::__construct($id,RESOURCE_GLOSSARY);
+        parent::__construct($id, RESOURCE_GLOSSARY);
         $this->glossary_id = $id;
         $this->name = $name;
         $this->description = $description;
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Link.php b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Link.php
index 3845ba5ab8..cfb4fa9334 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Link.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/Link.php
@@ -46,7 +46,7 @@ class Link extends Resource
         $category_id,
         $on_homepage
     ) {
-        parent::__construct($id,RESOURCE_LINK);
+        parent::__construct($id, RESOURCE_LINK);
         $this->title = $title;
         $this->url = $url;
         $this->description = $description;
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/LinkCategory.php b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/LinkCategory.php
index 4212e49648..fd6ffca672 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/LinkCategory.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/Resources/LinkCategory.php
@@ -29,9 +29,9 @@ class LinkCategory extends Resource
      * @param string $title
      * @param string $description
      */
-    public function __construct($id,$title,$description,$display_order)
+    public function __construct($id, $title, $description, $display_order)
     {
-        parent::__construct($id,RESOURCE_LINKCATEGORY);
+        parent::__construct($id, RESOURCE_LINKCATEGORY);
         $this->title = $title;
         $this->description = $description;
         $this->display_order = $display_order;

From fb1cbca981644aa59dd3211d28d269b5ce52d357 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 11:13:38 +0100
Subject: [PATCH 55/68] Fix docs

---
 main/inc/lib/agenda.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index e1172dbab2..7af78b103a 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -677,7 +677,7 @@ class Agenda
      * @param bool $updateContent
      * @param int $authorId
      *
-     * @return null|false
+     * @return bool
      */
     public function editEvent(
         $id,
@@ -1379,7 +1379,7 @@ class Agenda
     /**
      * Gets a single event
      *
-     * @param int event id
+     * @param int $id event id
      * @return array
      */
     public function get_event($id)

From ea168524543d0618716f83481790bb3084c7c9c1 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 11:15:43 +0100
Subject: [PATCH 56/68] Fix merge

---
 main/course_progress/thematic_plan.php | 43 ++++++++++++++++----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/main/course_progress/thematic_plan.php b/main/course_progress/thematic_plan.php
index 486759ebbf..0bca817e67 100755
--- a/main/course_progress/thematic_plan.php
+++ b/main/course_progress/thematic_plan.php
@@ -10,10 +10,10 @@
 // actions menu
 $new_thematic_plan_data = array();
 if (!empty($thematic_plan_data)) {
-    foreach($thematic_plan_data as $thematic_item) {
-    $thematic_simple_list[] = $thematic_item['description_type'];
-}
-    $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
+    foreach ($thematic_plan_data as $thematic_item) {
+        $thematic_simple_list[] = $thematic_item['description_type'];
+        $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
+    }
 }
 
 $new_id = ADD_THEMATIC_PLAN;
@@ -26,7 +26,7 @@ if (!empty($thematic_simple_list)) {
     }
 }
 
-$i=1;
+$i = 1;
 
 echo Display::tag('h2', $thematic_data['title']);
 echo $thematic_data['content'];
@@ -57,21 +57,21 @@ if ($action === 'thematic_plan_list') {
         $form->addElement('hidden', 'description_type['.$id.']', $id);
         $form->addText("title[$id]", [get_lang('Title'), null, $btnDelete], false);
         $form->addHtmlEditor(
-           'description['.$id.']',
-           get_lang('Description'),
-           false,
-           false,
-           array(
-               'ToolbarStartExpanded' => 'false',
-               'ToolbarSet' => 'TrainingDescription',
-               'Height' => '150'
-           )
+            'description['.$id.']',
+            get_lang('Description'),
+            false,
+            false,
+            array(
+                'ToolbarStartExpanded' => 'false',
+                'ToolbarSet' => 'TrainingDescription',
+                'Height' => '150'
+            )
         );
 
         if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) {
             $thematic_plan = $new_thematic_plan_data[$id];
             // set default values
-            $default['title['.$id.']']       = $thematic_plan['title'];
+            $default['title['.$id.']'] = $thematic_plan['title'];
             $default['description['.$id.']'] = $thematic_plan['description'];
             $thematic_plan = null;
         } else {
@@ -82,7 +82,16 @@ if ($action === 'thematic_plan_list') {
         $form->setDefaults($default);
     }
     $form->addGroup([
-        $form->addButton('add_item', get_lang('SaveAndAddNewItem'), 'plus', 'info', 'default', null, [], true),
+        $form->addButton(
+            'add_item',
+            get_lang('SaveAndAddNewItem'),
+            'plus',
+            'info',
+            'default',
+            null,
+            [],
+            true
+        ),
         $form->addButtonSave(get_lang('Save'), 'submit', true)
     ]);
     $form->display();
@@ -125,7 +134,7 @@ if ($action === 'thematic_plan_list') {
             'ToolbarStartExpanded' => 'false',
             'ToolbarSet' => 'TrainingDescription',
             'Width' => '80%',
-            'Height' => '150',
+            'Height' => '150'
         )
     );
     $form->addButtonSave(get_lang('Save'));

From b3c3b60b13d8f4c245621b306f28f8ccff958980 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 11:19:22 +0100
Subject: [PATCH 57/68] Format code

---
 main/course_progress/thematic.php            | 39 +++++++++-----------
 main/course_progress/thematic_controller.php |  2 -
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php
index 406635f9f3..48248a38db 100755
--- a/main/course_progress/thematic.php
+++ b/main/course_progress/thematic.php
@@ -20,16 +20,16 @@ if (api_is_allowed_to_edit(null, true)) {
     echo '<div class="actions">';
 
     switch ($action) {
-        case 'thematic_add' :
-        case 'thematic_import_select' :
+        case 'thematic_add':
+        case 'thematic_import_select':
             echo '<a href="index.php?'.api_get_cidreq().'">'.
                 Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'</a>';
             break;
-        case 'thematic_list' :
+        case 'thematic_list':
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
                 Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
             break;
-        case 'thematic_details' :
+        case 'thematic_details':
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
                 Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_import_select'.$url_token.'">'.
@@ -39,7 +39,7 @@ if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export_pdf'.$url_token.'">'.
                 Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
             break;
-        default :
+        default:
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
                 Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
     }
@@ -47,7 +47,6 @@ if (api_is_allowed_to_edit(null, true)) {
 }
 
 if ($action == 'thematic_list') {
-
     $table = new SortableTable(
         'thematic_list',
         array('Thematic', 'get_number_of_thematics'),
@@ -57,15 +56,19 @@ if ($action == 'thematic_list') {
     $parameters['action'] = $action;
     $table->set_additional_parameters($parameters);
     $table->set_header(0, '', false, array('style'=>'width:20px;'));
-    $table->set_header(1, get_lang('Title'), false );
+    $table->set_header(1, get_lang('Title'), false);
     if (api_is_allowed_to_edit(null, true)) {
-        $table->set_header(2, get_lang('Actions'), false,array('style'=>'text-align:center;width:40%;'));
+        $table->set_header(
+            2,
+            get_lang('Actions'),
+            false,
+            array('style' => 'text-align:center;width:40%;')
+        );
         $table->set_form_actions(array ('thematic_delete_select' => get_lang('DeleteAllThematics')));
     }
     $table->display();
 
 } elseif ($action == 'thematic_details') {
-
     if (isset($_GET['thematic_plan_save_message']) && $_GET['thematic_plan_save_message'] == 'ok') {
         Display::display_confirmation_message(get_lang('ThematicSectionHasBeenCreatedSuccessfull'));
     }
@@ -93,7 +96,6 @@ if ($action == 'thematic_list') {
 
     // Display thematic data
     if (!empty($thematic_data)) {
-
         // display progress
         echo '<div style="text-align:right;"><h2>'.get_lang('Progress').': <span id="div_result">'.$total_average_of_advances.'</span> %</h2></div>';
         echo '<table width="100%" class="data_table">';
@@ -113,12 +115,11 @@ if ($action == 'thematic_list') {
             $actions_first_col = '';
             if (api_is_allowed_to_edit(null, true)) {
                 // Thematic title
-                $actions_first_col  = Display::url(
+                $actions_first_col = Display::url(
                     Display::return_icon('cd.gif', get_lang('Copy')),
                     'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token
                 );
                 if (api_get_session_id() == 0 ) {
-
                     if ($thematic['display_order'] > 1) {
                         $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
                     } else {
@@ -129,7 +130,6 @@ if ($action == 'thematic_list') {
                     } else {
                         $actions_first_col .= ' '.Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
                     }
-
                 }
                 if (api_get_session_id() == $thematic['session_id']) {
                     $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
@@ -143,9 +143,7 @@ if ($action == 'thematic_list') {
             echo Display::tag('td', Display::tag('h3', Security::remove_XSS($thematic['title'], STUDENT).$session_star).Security::remove_XSS($thematic['content'], STUDENT).$actions_first_col, array('id'=>'thematic_td_content_'.$thematic['id'], 'class'=>'thematic_content'));
 
             // Display 2nd column - thematic plan data
-
             echo '<td>';
-
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
@@ -172,7 +170,6 @@ if ($action == 'thematic_list') {
             if (!empty($thematic_advance_data[$thematic['id']])) {
                 echo '<table width="100%">';
                 foreach ($thematic_advance_data[$thematic['id']] as $thematic_advance) {
-
                     $thematic_advance['start_date'] = api_get_local_time($thematic_advance['start_date']);
                     $thematic_advance['start_date'] = api_format_date($thematic_advance['start_date'], DATE_TIME_FORMAT_LONG);
                     echo '<tr>';
@@ -193,17 +190,17 @@ if ($action == 'thematic_list') {
                                 'thematic_advance_id' => $thematic_advance['id']
                             ])
                         );
-                        $edit_link  .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
+                        $edit_link .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
                             Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a></center>';
 
-                        //Links
+                        // Links
                         $edit_link = Display::div(
-                            Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
+                            Display::div($edit_link, array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
                             array('style'=>'height:20px;')
                         );
                     }
 
-                    $thematic_advance_item =  isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
+                    $thematic_advance_item = isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
                     echo Display::div($thematic_advance_item, array('id'=>'thematic_advance_'.$thematic_advance['id']));
                     echo $edit_link;
                     echo '</td>';
@@ -246,10 +243,8 @@ if ($action == 'thematic_list') {
         echo '<div><em>'.get_lang('ThereIsNoAThematicSection').'</em></div>';
     }
 } elseif ($action == 'thematic_add' || $action == 'thematic_edit') {
-
     // Display form
     $form = new FormValidator('thematic_add','POST','index.php?action=thematic_add&'.api_get_cidreq());
-
     if ($action == 'thematic_edit') {
         $form->addElement('header', '', get_lang('EditThematicSection'));
     }
diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php
index e640719303..7329ec4ebe 100755
--- a/main/course_progress/thematic_controller.php
+++ b/main/course_progress/thematic_controller.php
@@ -49,7 +49,6 @@ class ThematicController
                     if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
                         if (trim($_POST['title']) !== '') {
                             if (api_is_allowed_to_edit(null, true)) {
-
                                 $id = isset($_POST['thematic_id']) ? $_POST['thematic_id'] : null;
                                 $title = trim($_POST['title']);
                                 $content = trim($_POST['content']);
@@ -121,7 +120,6 @@ class ThematicController
 
                     // Import the progress.
                     $current_thematic = null;
-
                     foreach ($csv_import_array as $key => $item) {
                         if (!$key) {
                             continue;

From 21afa46d5960ba812adc35cd0b1a49f0b9d8853d Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 12:33:00 +0100
Subject: [PATCH 58/68] Remove unused file.

---
 main/admin/course_create_content.php | 29 ----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100755 main/admin/course_create_content.php

diff --git a/main/admin/course_create_content.php b/main/admin/course_create_content.php
deleted file mode 100755
index 37ad7de7ff..0000000000
--- a/main/admin/course_create_content.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-/**
- * This script allows a platform admin to add dummy content to a course.
- *
- * @author Bart Mollet <bart.mollet@hogent.be>
- * @package chamilo.admin
- */
-require_once __DIR__.'/../inc/global.inc.php';
-$this_section=SECTION_PLATFORM_ADMIN;
-
-api_protect_admin_script();
-$tool_name = get_lang('DummyCourseCreator');
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
-Display::display_header($tool_name);
-//api_display_tool_title($tool_name);
-if (api_get_setting('server_type') != 'test') {
-	echo get_lang('DummyCourseOnlyOnTestServer');
-} elseif( isset($_POST['action'])) {
-	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
-	$dcc = new DummyCourseCreator();
-	$dcc->create_dummy_course($_POST['course_code']);
-	echo get_lang('Done');
-} else {
-	echo get_lang('DummyCourseDescription');
-	echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
-}
-
-Display::display_footer();

From 3f48324277c5016900545d8205b65da481ec5d45 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 12:38:58 +0100
Subject: [PATCH 59/68] Minor - Format code

---
 .../admin/access_url_add_usergroup_to_url.php |  19 +-
 main/admin/access_url_add_users_to_url.php    |  40 ++--
 main/admin/access_url_check_user_session.php  |  28 +--
 main/admin/access_url_edit.php                |   7 +-
 ...access_url_edit_course_category_to_url.php |   2 -
 main/admin/access_url_edit_courses_to_url.php |   5 +-
 .../access_url_edit_usergroup_to_url.php      |   2 -
 main/admin/access_url_edit_users_to_url.php   |   6 +-
 main/admin/access_urls.php                    |  34 +--
 main/admin/add_courses_to_usergroup.php       |   5 -
 main/admin/add_sessions_to_promotion.php      |   8 +-
 main/admin/add_sessions_to_usergroup.php      |  32 +--
 main/admin/career_dashboard.php               |  22 +-
 main/admin/cli.php                            |   4 +-
 main/admin/configure_extensions.php           |  92 ++++----
 main/admin/configure_inscription.php          |   2 +-
 main/admin/course_add.php                     |   2 +-
 main/admin/course_category.php                |   2 +-
 main/admin/course_edit.php                    |   4 +-
 main/admin/course_list.php                    |   4 +-
 main/admin/course_request_accepted.php        |   5 +-
 main/admin/course_request_edit.php            |   5 +-
 main/admin/course_request_rejected.php        |   7 +-
 main/admin/course_request_review.php          |   1 -
 main/admin/course_user_import.php             |   6 +-
 main/admin/dashboard_add_courses_to_user.php  |  27 ++-
 main/admin/dashboard_add_sessions_to_user.php |  10 +-
 main/admin/dashboard_add_users_to_user.php    |   6 +-
 main/admin/event_type.php                     |   6 +-
 main/admin/export_certificates.php            |   2 -
 main/admin/extra_field_options.php            |   1 -
 main/admin/languages.php                      |   3 -
 main/course_home/course_home.php              |   7 +-
 main/inc/lib/AnnouncementManager.php          |   4 +-
 ..._url_edit_courses_to_url_functions.lib.php |   8 +-
 .../add_courses_to_session_functions.lib.php  | 204 +++++++++---------
 ...many_session_to_category_functions.lib.php |  49 ++---
 main/inc/lib/app_view.php                     |   4 +-
 main/inc/lib/grade_model.lib.php              |   4 +-
 user_portal.php                               |   9 +-
 40 files changed, 342 insertions(+), 346 deletions(-)

diff --git a/main/admin/access_url_add_usergroup_to_url.php b/main/admin/access_url_add_usergroup_to_url.php
index 3d85b9c71d..3d836f5878 100755
--- a/main/admin/access_url_add_usergroup_to_url.php
+++ b/main/admin/access_url_add_usergroup_to_url.php
@@ -1,12 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-*	This script allows platform admins to add users to urls.
-*	It displays a list of users and a list of courses;
-*	you can select multiple users and courses and then click on
-*	@package chamilo.admin
-*	@author Julio Montoya <gugli100@gmail.com>
-*/
+ *  This script allows platform admins to add users to urls.
+ *  It displays a list of users and a list of courses;
+ *  you can select multiple users and courses and then click on
+ *  @package chamilo.admin
+ *  @author Julio Montoya <gugli100@gmail.com>
+ */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -18,7 +18,6 @@ if (!api_get_multiple_access_url()) {
 }
 
 $userGroup = new UserGroup();
-
 $form_sent = 0;
 $firstLetterUserGroup = null;
 $courses = array();
@@ -84,10 +83,10 @@ $db_urls = Database::store_result($result);
              <?php echo get_lang('FirstLetter'); ?> :
              <select name="first_letter_user_group" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
                 <option value="">--</option>
-                  <?php
+                <?php
                     echo Display::get_alphabet_options($firstLetterUserGroup);
                     echo Display::get_numeric_options(0, 9, $firstLetterUserGroup);
-                    ?>
+                ?>
             </select>
         </td>
         <td width="20%">&nbsp;</td>
@@ -109,7 +108,7 @@ $db_urls = Database::store_result($result);
    </td>
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
-		<?php foreach ($db_urls as $url_obj) { ?>
+        <?php foreach ($db_urls as $url_obj) { ?>
         <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php
index c3b1a03fbb..5b4bd90f2b 100755
--- a/main/admin/access_url_add_users_to_url.php
+++ b/main/admin/access_url_add_users_to_url.php
@@ -1,12 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-* This script allows platform admins to add users to urls.
-*	It displays a list of users and a list of courses;
-*	you can select multiple users and courses and then click on
-*	@package chamilo.admin
-*	@author Julio Montoya <gugli100@gmail.com>
-*/
+ * This script allows platform admins to add users to urls.
+ *    It displays a list of users and a list of courses;
+ *    you can select multiple users and courses and then click on
+ * @package chamilo.admin
+ * @author Julio Montoya <gugli100@gmail.com>
+ */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -20,13 +20,13 @@ if (!api_get_multiple_access_url()) {
 $form_sent = 0;
 $first_letter_user = '';
 $first_letter_course = '';
-$courses = array ();
+$courses = array();
 $url_list = array();
 $users = array();
 
 $tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-$tbl_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
-$tbl_user 		= Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_access_url = Database:: get_main_table(TABLE_MAIN_ACCESS_URL);
+$tbl_user = Database:: get_main_table(TABLE_MAIN_USER);
 
 /*	Header	*/
 $tool_name = get_lang('AddUsersToURL');
@@ -37,8 +37,9 @@ Display :: display_header($tool_name);
 
 echo '<div class="actions">';
 echo Display::url(
-    Display::return_icon('edit.png', get_lang('EditUsersToURL'),''),
-    api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php');
+    Display::return_icon('edit.png', get_lang('EditUsersToURL'), ''),
+    api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php'
+);
 echo '</div>';
 
 api_display_tool_title($tool_name);
@@ -48,17 +49,18 @@ if ($_POST['form_sent']) {
     $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
     $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
     $first_letter_user = $_POST['first_letter_user'];
-
-    foreach($users as $key => $value) {
+    foreach ($users as $key => $value) {
         $users[$key] = intval($value);
     }
 
     if ($form_sent == 1) {
         if (count($users) == 0 || count($url_list) == 0) {
-            Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
+            Display:: display_error_message(
+                get_lang('AtLeastOneUserAndOneURL')
+            );
         } else {
-            UrlManager::add_users_to_urls($users,$url_list);
-            Display :: display_confirmation_message(get_lang('UsersBelongURL'));
+            UrlManager::add_users_to_urls($users, $url_list);
+            Display:: display_confirmation_message(get_lang('UsersBelongURL'));
         }
     }
 }
@@ -115,13 +117,13 @@ unset($result);
    <tr>
     <td width="40%" align="center">
      <select name="user_list[]" multiple="multiple" size="20" style="width:380px;">
-		<?php
+        <?php
         foreach ($db_users as $user) {
         ?>
             <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
-                <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
+            <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
-		<?php
+        <?php
         }
         ?>
     </select>
diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php
index 9d39cfd0ce..cf08f8df7e 100755
--- a/main/admin/access_url_check_user_session.php
+++ b/main/admin/access_url_check_user_session.php
@@ -1,10 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-*	@author Bart Mollet, Julio Montoya lot of fixes
-*	@package chamilo.admin
-*/
-/*		INIT SECTION */
+ * @author Bart Mollet, Julio Montoya lot of fixes
+ * @package chamilo.admin
+ */
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -14,15 +14,14 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 
 $tool_name = get_lang('SessionOverview');
-
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
 $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$table_access_url_user              = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-$url_id                             = api_get_current_access_url_id();
+$table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+$url_id = api_get_current_access_url_id();
 
 $action = $_GET['action'];
 
@@ -32,7 +31,13 @@ switch ($action) {
         $result = UrlManager::add_user_to_url($user_id, $url_id);
         $user_info = api_get_user_info($user_id);
         if ($result) {
-            $message = Display::return_message(get_lang('UserAdded').' '.api_get_person_name($user_info['firstname'], $user_info['lastname']), 'confirm');
+            $message = Display::return_message(
+                get_lang('UserAdded').' '.api_get_person_name(
+                    $user_info['firstname'],
+                    $user_info['lastname']
+                ),
+                'confirm'
+            );
         }
         break;
 }
@@ -44,9 +49,7 @@ if (!empty($message)) {
 }
 
 $multiple_url_is_on = api_get_multiple_access_url();
-
 $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
-
 $session_list = SessionManager::get_sessions_list();
 
 $html = '';
@@ -57,11 +60,9 @@ if ($show_users_with_problems) {
     $html .= '<a href="'.api_get_self().'?show_users_with_problems=1">'.get_lang('ShowUsersNotAddedInTheURL').'</a>';
 }
 
-
-foreach ($session_list  as $session_item) {
+foreach ($session_list as $session_item) {
     $session_id = $session_item['id'];
     $html .= '<h3>'.$session_item['name'].'</h3>';
-
     $access_where = "(access_url_id = $url_id OR access_url_id is null )";
     if ($show_users_with_problems) {
         $access_where = "(access_url_id is null)";
@@ -89,7 +90,6 @@ foreach ($session_list  as $session_item) {
             }
 
             $link_to_add_user_in_url = '';
-
             if ($multiple_url_is_on) {
                 if ($user['access_url_id'] != $url_id) {
                     $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), ICON_SIZE_MEDIUM);
diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php
index 12aed3cba4..8e546b58d0 100755
--- a/main/admin/access_url_edit.php
+++ b/main/admin/access_url_edit.php
@@ -1,8 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * 	@package chamilo.admin
- * 	@author Julio Montoya <gugli100@gmail.com>
+ * @package chamilo.admin
+ * @author Julio Montoya <gugli100@gmail.com>
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -51,7 +51,8 @@ if ($form->validate()) {
                             unlink($url_images_dir . $url_id . '_' . $image_field . '.png');
                         }
                         move_uploaded_file(
-                            $_FILES[$image_field]['tmp_name'], $url_images_dir . $url_id . '_' . $image_field . '.png'
+                            $_FILES[$image_field]['tmp_name'],
+                            $url_images_dir.$url_id.'_'.$image_field.'.png'
                         );
                     }
                     // else fail silently
diff --git a/main/admin/access_url_edit_course_category_to_url.php b/main/admin/access_url_edit_course_category_to_url.php
index f2174708a0..e6b805ee75 100755
--- a/main/admin/access_url_edit_course_category_to_url.php
+++ b/main/admin/access_url_edit_course_category_to_url.php
@@ -7,7 +7,6 @@
 
 // resetting the course id
 $cidReset = true;
-
 require_once __DIR__.'/../inc/global.inc.php';
 
 $xajax = new xajax();
@@ -97,7 +96,6 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 }
 
 Display::display_header($tool_name);
-
 api_display_tool_title($tool_name);
 
 $noUserGroupList = $userGroupList = array();
diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
index 68c39806ce..d28994eaaf 100755
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -36,12 +36,12 @@ $interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('Multi
 
 $add_type = 'multiple';
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 $access_url_id = 1;
 if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id'] != '') {
-	$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
+    $access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
 }
 
 $xajax -> processRequests();
@@ -325,7 +325,6 @@ $url_list = UrlManager::get_url_data();
 			nosessionClasses = makepost(document.getElementById('origin_classes'));
 			sessionClasses = makepost(document.getElementById('destination_classes'));
 			xhr_object.send("nosessionusers="+nosessionUsers+"&sessionusers="+sessionUsers+"&nosessionclasses="+nosessionClasses+"&sessionclasses="+sessionClasses);
-
 			xhr_object.onreadystatechange = function() {
 				if(xhr_object.readyState == 4) {
 					document.getElementById('content_source').innerHTML = result = xhr_object.responseText;
diff --git a/main/admin/access_url_edit_usergroup_to_url.php b/main/admin/access_url_edit_usergroup_to_url.php
index 3fc35e9b38..2b194774ab 100755
--- a/main/admin/access_url_edit_usergroup_to_url.php
+++ b/main/admin/access_url_edit_usergroup_to_url.php
@@ -45,10 +45,8 @@ $htmlHeadXtra[] = '
 function add_user_to_url(code, content) {
 	document.getElementById("course_to_add").value = "";
 	document.getElementById("ajax_list_courses").innerHTML = "";
-
 	destination = document.getElementById("destination_users");
 	destination.options[destination.length] = new Option(content,code);
-
 	destination.selectedIndex = -1;
 	sortOptions(destination.options);
 }
diff --git a/main/admin/access_url_edit_users_to_url.php b/main/admin/access_url_edit_users_to_url.php
index 7874b839f8..51e959c8d5 100755
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
@@ -1,8 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * 	@package chamilo.admin
- * 	@author Julio Montoya <gugli100@gmail.com>
+ * @package chamilo.admin
+ * @author Julio Montoya <gugli100@gmail.com>
  */
 // resetting the course id
 $cidReset = true;
@@ -48,10 +48,8 @@ $htmlHeadXtra[] = '<script>
 function add_user_to_url(code, content) {
 	document.getElementById("user_to_add").value = "";
 	document.getElementById("ajax_list_users").innerHTML = "";
-
 	destination = document.getElementById("destination_users");
 	destination.options[destination.length] = new Option(content,code);
-
 	destination.selectedIndex = -1;
 	sortOptions(destination.options);
 }
diff --git a/main/admin/access_urls.php b/main/admin/access_urls.php
index 199229f2d8..7a3c07f2b5 100755
--- a/main/admin/access_urls.php
+++ b/main/admin/access_urls.php
@@ -79,16 +79,24 @@ foreach ($url_list as $my_url) {
         $url_string .= $my_url['url'].' <br />';
     }
 }
-if(!empty($url_string)) {
-	Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string,false);
+if (!empty($url_string)) {
+    Display:: display_warning_message(
+        get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string,
+        false
+    );
 }
 
 // checking the current installation
-if ($current_access_url_id==-1) {
-	Display::display_warning_message(get_lang('URLNotConfiguredPleaseChangedTo').': '.api_get_path(WEB_PATH));
-} elseif(api_is_platform_admin()) {
-    $quant= UrlManager::relation_url_user_exist(api_get_user_id(),$current_access_url_id);
-    if ($quant==0) {
+if ($current_access_url_id == -1) {
+    Display::display_warning_message(
+        get_lang('URLNotConfiguredPleaseChangedTo').': '.api_get_path(WEB_PATH)
+    );
+} elseif (api_is_platform_admin()) {
+    $quant = UrlManager::relation_url_user_exist(
+        api_get_user_id(),
+        $current_access_url_id
+    );
+    if ($quant == 0) {
         Display:: display_warning_message(
             '<a href="'.api_get_self().'?action=register&sec_token='.$parameters['sec_token'].'">'.get_lang('ClickToRegisterAdmin').'</a>',
             false
@@ -135,13 +143,13 @@ foreach ($sortable_data as $row) {
 
     //Status
     $active = $row['active'];
-    if ($active=='1') {
-        $action='lock';
-        $image='right';
+    if ($active == '1') {
+        $action = 'lock';
+        $image = 'right';
     }
-    if ($active=='0') {
-        $action='unlock';
-        $image='wrong';
+    if ($active == '0') {
+        $action = 'unlock';
+        $image = 'wrong';
     }
     // you cannot lock the default
     if ($row['id']=='1') {
diff --git a/main/admin/add_courses_to_usergroup.php b/main/admin/add_courses_to_usergroup.php
index c401bc3192..206046a75b 100755
--- a/main/admin/add_courses_to_usergroup.php
+++ b/main/admin/add_courses_to_usergroup.php
@@ -32,7 +32,6 @@ if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
 }
 
 $add = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;
-
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
 $htmlHeadXtra[] = '<script>
 function add_user_to_session (code, content) {
@@ -87,7 +86,6 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     }
 }
 
-
 // Filters
 $filters = array(
     array('type' => 'text', 'name' => 'code', 'label' => get_lang('CourseCode')),
@@ -201,11 +199,8 @@ echo '</div>';
 echo '<div id="advanced_search_options" style="display:none">';
 $searchForm->display();
 echo '</div>';
-
 ?>
-
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
-
 <?php echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
 echo Display::input('hidden', 'id', $id);
 echo Display::input('hidden', 'form_sent', '1');
diff --git a/main/admin/add_sessions_to_promotion.php b/main/admin/add_sessions_to_promotion.php
index dc65ebc689..f9b449e23b 100755
--- a/main/admin/add_sessions_to_promotion.php
+++ b/main/admin/add_sessions_to_promotion.php
@@ -65,9 +65,9 @@ function validate_filter() {
 </script>';
 
 
-$form_sent  = 0;
-$errorMsg   = '';
-$users      =$sessions=array();
+$form_sent = 0;
+$errorMsg = '';
+$users = $sessions = array();
 $promotion = new Promotion();
 $id = intval($_GET['id']);
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
@@ -86,7 +86,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 
 $promotion_data = $promotion->get($id);
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
-$session_not_in_promotion = $session_in_promotion= array();
+$session_not_in_promotion = $session_in_promotion = array();
 
 if (!empty($session_list)) {
     foreach ($session_list as $session) {
diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php
index bb3d308e3a..c4b5855dab 100755
--- a/main/admin/add_sessions_to_usergroup.php
+++ b/main/admin/add_sessions_to_usergroup.php
@@ -98,15 +98,13 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
         exit;
     }
 }
-$data               = $usergroup->get($id);
-$session_list_in    = $usergroup->get_sessions_by_usergroup($id);
-$session_list       = SessionManager::get_sessions_list(array(), array('name'));
-
-//api_display_tool_title($tool_name.' ('.$session_info['name'].')');
-$elements_not_in = $elements_in= array();
+$data = $usergroup->get($id);
+$session_list_in = $usergroup->get_sessions_by_usergroup($id);
+$session_list = SessionManager::get_sessions_list(array(), array('name'));
+$elements_not_in = $elements_in = array();
 
 if (!empty($session_list)) {
-    foreach($session_list as $session) {
+    foreach ($session_list as $session) {
         if (in_array($session['id'], $session_list_in)) {
             $elements_in[$session['id']] = $session['name'];
         } else {
@@ -134,17 +132,19 @@ function search_usergroup_sessions($needle,$type) {
                 array('s.name' => array('operator' => 'LIKE', 'value' => "$needle%"))
             );
         }
-        $i=0;
         if ($type != 'single') {
             $return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
-
-            foreach ($session_list as $row ) {
+            foreach ($session_list as $row) {
                 if (!in_array($row['id'], array_keys($elements_in))) {
                     $return .= '<option value="'.$row['id'].'">'.$row['name'].'</option>';
                 }
             }
             $return .= '</select>';
-            $xajax_response -> addAssign('ajax_list_multiple','innerHTML',api_utf8_encode($return));
+            $xajax_response->addAssign(
+                'ajax_list_multiple',
+                'innerHTML',
+                api_utf8_encode($return)
+            );
         }
     }
 
@@ -176,10 +176,10 @@ echo '<div id="advancedSearch" style="display: none">'. get_lang('SearchSessions
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
 <?php
 echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
-echo Display::input('hidden','id',$id);
-echo Display::input('hidden','form_sent','1');
-echo Display::input('hidden','add_type',null);
-if(!empty($errorMsg)) {
+echo Display::input('hidden', 'id', $id);
+echo Display::input('hidden', 'form_sent', '1');
+echo Display::input('hidden', 'add_type', null);
+if (!empty($errorMsg)) {
     Display::display_normal_message($errorMsg); //main API
 }
 ?>
@@ -266,7 +266,7 @@ if(!empty($errorMsg)) {
 </table>
 </form>
 
-<script type="text/javascript">
+<script>
 function moveItem(origin , destination) {
     for(var i = 0 ; i<origin.options.length ; i++) {
         if(origin.options[i].selected) {
diff --git a/main/admin/career_dashboard.php b/main/admin/career_dashboard.php
index bf861d850a..ee34b6c755 100755
--- a/main/admin/career_dashboard.php
+++ b/main/admin/career_dashboard.php
@@ -18,8 +18,14 @@ $this_section = SECTION_PLATFORM_ADMIN;
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
+$interbreadcrumb[] = array(
+    'url' => 'index.php',
+    'name' => get_lang('PlatformAdmin')
+);
+$interbreadcrumb[] = array(
+    'url' => 'career_dashboard.php',
+    'name' => get_lang('CareersAndPromotions')
+);
 
 Display :: display_header(null);
 
@@ -142,19 +148,19 @@ if (!empty($career_arrayer)) {
                 if (!empty($sessions)) {
                     foreach ($sessions as $session) {
                         $course_list = $session['courses'];
-
-                        $url = Display::url($session['data']['name'],
-                            '../session/resume_session.php?id_session=' . $session['data']['id']);
+                        $url = Display::url(
+                            $session['data']['name'],
+                            '../session/resume_session.php?id_session='.$session['data']['id']
+                        );
                         echo '<tr>';
-                        //Session name
+                        // Session name
                         echo Display::tag('td', $url);
                         echo '<td>';
-                        //Courses
+                        // Courses
                         echo '<table>';
                         if (!empty($course_list)) {
                             foreach ($course_list as $course) {
                                 echo '<tr>';
-
                                 $url = Display::url(
                                     $course['title'],
                                     api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . $session['data']['id']
diff --git a/main/admin/cli.php b/main/admin/cli.php
index cfb0e35085..aee8d5eb84 100755
--- a/main/admin/cli.php
+++ b/main/admin/cli.php
@@ -6,9 +6,7 @@
 * @author Arnaud Ligot, CBlue SPRL
 * @package chamilo.admin.cli
 */
-/**
- * Init section
- */
+
 // we are in the admin area so we do not need a course id
 $cidReset = true;
 // include global script
diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php
index c746b5ef68..f30389108f 100755
--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.php
@@ -17,56 +17,56 @@ $tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
 $message = '';
 
 if (isset($_POST['activeExtension'])) {
-	switch ($_POST['extension_code']) {
-		case 'ppt2lp':
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="true"
-					WHERE variable="service_ppt2lp"
-					AND subkey="active"';
+    switch ($_POST['extension_code']) {
+        case 'ppt2lp':
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="true"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="active"';
 
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			if (Database::affected_rows($rs) > 0) {
-				$message = get_lang('ServiceActivated');
-			}
+            if (Database::affected_rows($rs) > 0) {
+                $message = get_lang('ServiceActivated');
+            }
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="'.addslashes($_POST['host']).'"
-					WHERE variable="service_ppt2lp"
-					AND subkey="host"';
-			Database::query($sql);
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="'.addslashes($_POST['host']).'"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="host"';
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="'.addslashes($_POST['port']).'"
-					WHERE variable="service_ppt2lp"
-					AND subkey="port"';
-			Database::query($sql);
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="'.addslashes($_POST['port']).'"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="port"';
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="'.addslashes($_POST['ftp_password']).'"
-					WHERE variable="service_ppt2lp"
-					AND subkey="ftp_password"';
-			Database::query($sql);
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="'.addslashes($_POST['ftp_password']).'"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="ftp_password"';
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="'.addslashes($_POST['user']).'"
-					WHERE variable="service_ppt2lp"
-					AND subkey="user"';
-			Database::query($sql);
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="'.addslashes($_POST['user']).'"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="user"';
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="'.addslashes($_POST['path_to_lzx']).'"
-					WHERE variable="service_ppt2lp"
-					AND subkey="path_to_lzx"';
-			Database::query($sql);
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="'.addslashes($_POST['path_to_lzx']).'"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="path_to_lzx"';
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
-					selected_value="'.addslashes($_POST['size']).'"
-					WHERE variable="service_ppt2lp"
-					AND subkey="size"';
-			Database::query($sql);
-			break;
-	}
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
+                    selected_value="'.addslashes($_POST['size']).'"
+                    WHERE variable="service_ppt2lp"
+                    AND subkey="size"';
+            Database::query($sql);
+            break;
+    }
 }
 
 $listActiveServices = array();
@@ -77,15 +77,15 @@ $sql = 'SELECT variable FROM '.$tbl_settings_current.'
 
 $rs = Database::query($sql);
 while ($row = Database::fetch_array($rs)) {
-	$listActiveServices[] = $row['variable'];
+    $listActiveServices[] = $row['variable'];
 }
 
 // javascript to handle accordion behaviour
 $javascript_message = '';
 if (!empty($message)) {
-	$javascript_message = '
-	document.getElementById("message").style.display = "block";
-	var timer = setTimeout(hideMessage, 5000);';
+    $javascript_message = '
+    document.getElementById("message").style.display = "block";
+    var timer = setTimeout(hideMessage, 5000);';
 }
 $htmlHeadXtra[] = '<script>
 var listeDiv;
diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php
index 0edfe25e99..a1b6704e77 100755
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@@ -46,7 +46,7 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $tool_name = get_lang('ConfigureInscription');
 if (!empty($action)) {
     $interbreadcrumb[] = array('url' => 'configure_inscription.php', 'name' => get_lang('ConfigureInscription'));
-    switch($action) {
+    switch ($action) {
         case 'edit_top':
             $tool_name = get_lang('EditTopRegister');
             break;
diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index 3dc5dcb695..924d0a1922 100755
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 /**
- *	@package chamilo.admin
+ * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/course_category.php b/main/admin/course_category.php
index e5d289bbac..e43c6d8054 100755
--- a/main/admin/course_category.php
+++ b/main/admin/course_category.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * 	@package chamilo.admin
+ * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/course_edit.php b/main/admin/course_edit.php
index 36fb142b93..adbcfc0d62 100755
--- a/main/admin/course_edit.php
+++ b/main/admin/course_edit.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * 	@package chamilo.admin
+ * @package chamilo.admin
  */
 $cidReset = true;
 
@@ -59,7 +59,7 @@ if (api_is_multiple_url_enabled()) {
             ON (u.user_id=url_rel_user.user_id)
             WHERE
                 url_rel_user.access_url_id=" . api_get_current_access_url_id() . " AND
-                status=1" . $order_clause;
+                status = 1" . $order_clause;
 } else {
     $sql = "SELECT user_id, lastname, firstname
             FROM $table_user WHERE status='1'" . $order_clause;
diff --git a/main/admin/course_list.php b/main/admin/course_list.php
index feed496c5c..892743786e 100755
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
@@ -30,7 +30,7 @@ function get_number_of_courses()
                  ON (c.id = url_rel_course.c_id)";
     }
 
-    if (isset ($_GET['keyword'])) {
+    if (isset($_GET['keyword'])) {
         $keyword = Database::escape_string("%".$_GET['keyword']."%");
         $sql .= " WHERE (
                         c.title LIKE '".$keyword."' OR
@@ -105,7 +105,7 @@ function get_course_data($from, $number_of_items, $column, $direction)
                  ON (course.id = url_rel_course.c_id)";
     }
 
-    if (isset ($_GET['keyword'])) {
+    if (isset($_GET['keyword'])) {
         $keyword = Database::escape_string("%".trim($_GET['keyword'])."%");
         $sql .= " WHERE (
             title LIKE '".$keyword."' OR
diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 3412049c30..6eccf74260 100755
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -14,9 +14,7 @@
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
-
 $this_section = SECTION_PLATFORM_ADMIN;
-
 api_protect_admin_script();
 
 // A check whether the course validation feature is enabled.
@@ -28,7 +26,6 @@ $message = isset($_GET['message']) ? trim(Security::remove_XSS(stripslashes(urld
 $is_error_message = !empty($_GET['is_error_message']);
 
 if ($course_validation_feature) {
-
     /**
      * Deletion of a course request.
      */
@@ -50,7 +47,7 @@ if ($course_validation_feature) {
     elseif (isset($_POST['action'])) {
         switch ($_POST['action']) {
             // Delete selected courses
-            case 'delete_course_requests' :
+            case 'delete_course_requests':
                 $course_requests = $_POST['course_request'];
                 if (is_array($_POST['course_request']) && !empty($_POST['course_request'])) {
                     $success = true;
diff --git a/main/admin/course_request_edit.php b/main/admin/course_request_edit.php
index d2ca1f8958..c756416408 100755
--- a/main/admin/course_request_edit.php
+++ b/main/admin/course_request_edit.php
@@ -22,7 +22,6 @@ $id = intval($_GET['id']);
 $caller = intval($_GET['caller']);
 
 if ($course_validation_feature) {
-
     // Retrieve request's data from the corresponding database record.
     $course_request_info = CourseRequestManager::get_course_request_info($id);
     if (!is_array($course_request_info)) {
@@ -30,7 +29,6 @@ if ($course_validation_feature) {
         $message = get_lang('CourseRequestHasNotBeenFound');
         $is_error_message = true;
     } else {
-
         // Ensure the database prefix + database name do not get over 40 characters.
         $maxlength = 40;
 
@@ -225,7 +223,8 @@ if ($course_validation_feature) {
 // Functions.
 
 // Converts the given numerical id to the name of the page that opened this editor.
-function get_caller_name($caller_id) {
+function get_caller_name($caller_id)
+{
     switch ($caller_id) {
         case 1:
             return 'course_request_accepted.php';
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index 5b3e1e811e..1c4cd826a3 100755
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -30,7 +30,6 @@ $message = isset($_GET['message']) ? trim(Security::remove_XSS(stripslashes(urld
 $is_error_message = !empty($_GET['is_error_message']);
 
 if ($course_validation_feature) {
-
     /**
      * Acceptance and creation of the requested course.
      */
@@ -77,7 +76,7 @@ if ($course_validation_feature) {
          */
         switch ($_POST['action']) {
             // Delete selected courses
-            case 'delete_course_requests' :
+            case 'delete_course_requests':
                 $course_requests = $_POST['course_request'];
                 if (is_array($_POST['course_request']) && !empty($_POST['course_request'])) {
                     $success = true;
@@ -99,7 +98,8 @@ if ($course_validation_feature) {
 /**
  * Get the number of courses which will be displayed.
  */
-function get_number_of_requests() {
+function get_number_of_requests()
+{
     return CourseRequestManager::count_course_requests(COURSE_REQUEST_REJECTED);
 }
 
@@ -165,7 +165,6 @@ function modify_filter($id) {
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'course_list.php', 'name' => get_lang('CourseList'));
 
-
 $tool_name = get_lang('RejectedCourseRequests');
 Display :: display_header($tool_name);
 
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index e3eef16b4d..2cc8a185ac 100755
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -33,7 +33,6 @@ $is_error_message = isset($_GET['is_error_message']) ? !empty($_GET['is_error_me
 $keyword = isset($_GET['keyword']) ? Database::escape_string(trim($_GET['keyword'])) : '';
 
 if ($course_validation_feature) {
-
     /**
      * Course acceptance and creation.
      */
diff --git a/main/admin/course_user_import.php b/main/admin/course_user_import.php
index bff5592799..b08b798cf7 100755
--- a/main/admin/course_user_import.php
+++ b/main/admin/course_user_import.php
@@ -26,7 +26,7 @@ function validate_data($users_courses)
         }
 
         // 2. Check whether coursecode exists.
-        if (isset ($user_course['CourseCode']) && strlen($user_course['CourseCode']) != 0) {
+        if (isset($user_course['CourseCode']) && strlen($user_course['CourseCode']) != 0) {
             // 2.1 Check whethher code has been allready used by this CVS-file.
             if (!isset($coursecodes[$user_course['CourseCode']])) {
                 // 2.1.1 Check whether course with this code exists in the system.
@@ -44,7 +44,7 @@ function validate_data($users_courses)
         }
 
         // 3. Check whether username exists.
-        if (isset ($user_course['UserName']) && strlen($user_course['UserName']) != 0) {
+        if (isset($user_course['UserName']) && strlen($user_course['UserName']) != 0) {
             if (UserManager::is_username_available($user_course['UserName'])) {
                 $user_course['error'] = get_lang('UnknownUser');
                 $errors[]             = $user_course;
@@ -52,7 +52,7 @@ function validate_data($users_courses)
         }
 
         // 4. Check whether status is valid.
-        if (isset ($user_course['Status']) && strlen($user_course['Status']) != 0) {
+        if (isset($user_course['Status']) && strlen($user_course['Status']) != 0) {
             if ($user_course['Status'] != COURSEMANAGER && $user_course['Status'] != STUDENT) {
                 $user_course['error'] = get_lang('UnknownStatus');
                 $errors[]             = $user_course;
diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php
index e4049530a2..f02f01f082 100755
--- a/main/admin/dashboard_add_courses_to_user.php
+++ b/main/admin/dashboard_add_courses_to_user.php
@@ -44,12 +44,12 @@ if (UserManager::is_admin($user_id)) {
 }
 
 $add_type = 'multiple';
-if(isset($_GET['add_type']) && $_GET['add_type']!='') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 if (!api_is_platform_admin()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 function search_courses($needle, $type)
@@ -60,8 +60,7 @@ function search_courses($needle, $type)
     $return = '';
     if (!empty($needle) && !empty($type)) {
         // xajax send utf8 datas... datas in db can be non-utf8 datas
-		$needle = Database::escape_string($needle);
-
+        $needle = Database::escape_string($needle);
         $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
         $assigned_courses_code = array_keys($assigned_courses_to_hrm);
         foreach ($assigned_courses_code as &$value) {
@@ -90,14 +89,14 @@ function search_courses($needle, $type)
 
 		$rs	= Database::query($sql);
 
-		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
-		while ($course = Database :: fetch_array($rs)) {
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
-		}
-		$return .= '</select>';
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-	}
-	return $xajax_response;
+        $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
+        while ($course = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
+        }
+        $return .= '</select>';
+        $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+    }
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -160,7 +159,7 @@ $msg = '';
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
     $courses_list = isset($_POST['CoursesList']) ? $_POST['CoursesList'] : [];
     $affected_rows = CourseManager::subscribeCoursesToDrhManager($user_id, $courses_list);
-    if ($affected_rows)	{
+    if ($affected_rows) {
         $msg = get_lang('AssignedCoursesHaveBeenUpdatedSuccessfully');
     }
 }
diff --git a/main/admin/dashboard_add_sessions_to_user.php b/main/admin/dashboard_add_sessions_to_user.php
index 35a5994f9e..86b8b57c44 100755
--- a/main/admin/dashboard_add_sessions_to_user.php
+++ b/main/admin/dashboard_add_sessions_to_user.php
@@ -2,8 +2,8 @@
 /* For licensing terms, see /license.txt */
 
 /**
- *	Interface for assigning sessions to Human Resources Manager
- *	@package chamilo.admin
+ *  Interface for assigning sessions to Human Resources Manager
+ *  @package chamilo.admin
  */
 // resetting the course id
 $cidReset = true;
@@ -88,7 +88,11 @@ function search_sessions($needle, $type)
             $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'],ENT_QUOTES).'">'.$session['name'].'</option>';
         }
         $return .= '</select>';
-        $xajax_response->addAssign('ajax_list_sessions_multiple','innerHTML',api_utf8_encode($return));
+        $xajax_response->addAssign(
+            'ajax_list_sessions_multiple',
+            'innerHTML',
+            api_utf8_encode($return)
+        );
     }
 
     return $xajax_response;
diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php
index 1f005a7bc7..86e7033c8c 100755
--- a/main/admin/dashboard_add_users_to_user.php
+++ b/main/admin/dashboard_add_users_to_user.php
@@ -2,9 +2,9 @@
 /* For licensing terms, see /license.txt */
 
 /**
-*	Interface for assigning users to Human Resources Manager
-*	@package chamilo.admin
-*/
+ *  Interface for assigning users to Human Resources Manager
+ *  @package chamilo.admin
+ */
 
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/event_type.php b/main/admin/event_type.php
index 5bab0db4d0..2b9ea12c3e 100755
--- a/main/admin/event_type.php
+++ b/main/admin/event_type.php
@@ -4,9 +4,7 @@
  * Definition of new system event types
  * @package chamilo.admin.events
  */
-/**
- * Init and access validation
- */
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -49,9 +47,7 @@ if ($action == 'modEventType') {
 }
 
 $ets = Event::get_all_event_types();
-
 $languages = api_get_languages();
-
 $ajaxPath = api_get_path(WEB_CODE_PATH) . 'inc/ajax/events.ajax.php';
 
 $action_array = array(
diff --git a/main/admin/export_certificates.php b/main/admin/export_certificates.php
index da12b1a8f3..9736246c81 100644
--- a/main/admin/export_certificates.php
+++ b/main/admin/export_certificates.php
@@ -6,9 +6,7 @@
  */
 
 $cidReset = true;
-
 require_once __DIR__.'/../inc/global.inc.php';
-
 Display::display_header(null);
 
 $form = new FormValidator('export_certificate');
diff --git a/main/admin/extra_field_options.php b/main/admin/extra_field_options.php
index 93e1811be8..4a638d8104 100755
--- a/main/admin/extra_field_options.php
+++ b/main/admin/extra_field_options.php
@@ -9,7 +9,6 @@ $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
-
 $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
 
 api_protect_admin_script();
diff --git a/main/admin/languages.php b/main/admin/languages.php
index 1a6cd267d7..f51a1d0722 100755
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
@@ -13,9 +13,6 @@
  * @since Dokeos 1.6
  * @package chamilo.admin
  */
-/**
- * 	   INIT SECTION
- */
 
 // we are in the admin area so we do not need a course id
 $cidReset = true;
diff --git a/main/course_home/course_home.php b/main/course_home/course_home.php
index 3b3894e5a6..bc7d9f6f8d 100755
--- a/main/course_home/course_home.php
+++ b/main/course_home/course_home.php
@@ -162,7 +162,6 @@ if (isset($_GET['action']) && $_GET['action'] == 'subscribe') {
 /*	Is the user allowed here? */
 api_protect_course_script(true);
 
-
 /*  STATISTICS */
 
 if (!isset($coursesAlreadyVisited[$course_code])) {
@@ -199,11 +198,9 @@ if (!empty($auto_launch)) {
                     WHERE c_id = $course_id AND autolaunch = 1 $condition
                     LIMIT 1";
             $result = Database::query($sql);
-            //If we found nothing in the session we just called the session_id =  0 autolaunch
+            // If we found nothing in the session we just called the session_id =  0 autolaunch
             if (Database::num_rows($result) ==  0) {
                 $condition = '';
-            } else {
-            	//great, there is an specific auto launch for this session we leave the $condition
             }
         }
 
@@ -212,7 +209,7 @@ if (!empty($auto_launch)) {
                 LIMIT 1";
         $result = Database::query($sql);
         if (Database::num_rows($result) >  0) {
-            $lp_data = Database::fetch_array($result,'ASSOC');
+            $lp_data = Database::fetch_array($result, 'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
                 	$show_autolaunch_lp_warning = true;
diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php
index d91b53a98e..ec8042f9e4 100755
--- a/main/inc/lib/AnnouncementManager.php
+++ b/main/inc/lib/AnnouncementManager.php
@@ -120,7 +120,7 @@ class AnnouncementManager
     /**
      * This functions switches the visibility a course resource
      * using the visibility field in 'item_property'
-     * @param    array	$_course
+     * @param    array $_course
      * @param    int     $id ID of the element of the corresponding type
      * @return   bool    False on failure, True on success
      */
@@ -300,6 +300,8 @@ class AnnouncementManager
     /**
      * Displays one specific announcement
      * @param int $announcement_id, the id of the announcement you want to display
+     *
+     * @return string
      */
     public static function display_announcement($announcement_id)
     {
diff --git a/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php b/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
index 017238f940..e90ec98397 100755
--- a/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
+++ b/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
@@ -54,8 +54,12 @@ class Accessurleditcoursestourl
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
-        
+        $xajax_response->addAssign(
+            'ajax_list_courses',
+            'innerHTML',
+            api_utf8_encode($return)
+        );
+
         return $xajax_response;
     }
 }
diff --git a/main/inc/lib/add_courses_to_session_functions.lib.php b/main/inc/lib/add_courses_to_session_functions.lib.php
index c2e5117f02..a7f5790ba4 100755
--- a/main/inc/lib/add_courses_to_session_functions.lib.php
+++ b/main/inc/lib/add_courses_to_session_functions.lib.php
@@ -6,121 +6,119 @@
  */
 class AddCourseToSession
 {
-	/**
-	 * Searches a course, given a search string and a type of search box
-	 * @param string $needle Search string
-	 * @param string $type Type of search box ('single' or anything else)
-	 * @return xajaxResponse XajaxResponse
-	 * @assert ('abc', 'single') !== null
-	 * @assert ('abc', 'multiple') !== null
-	 */
-	public static function search_courses($needle, $type)
-	{
-		global $tbl_session_rel_course, $id_session;
+    /**
+     * Searches a course, given a search string and a type of search box
+     * @param string $needle Search string
+     * @param string $type Type of search box ('single' or anything else)
+     * @return xajaxResponse XajaxResponse
+     * @assert ('abc', 'single') !== null
+     * @assert ('abc', 'multiple') !== null
+     */
+    public static function search_courses($needle, $type)
+    {
+        global $tbl_session_rel_course, $id_session;
         $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
-		$course_title = null;
-		$xajax_response = new xajaxResponse();
-		$return = '';
-		if (!empty($needle) && !empty($type)) {
-			// xajax send utf8 datas... datas in db can be non-utf8 datas
-			$charset = api_get_system_encoding();
-			$needle = api_convert_encoding($needle, $charset, 'utf-8');
+        $course_title = null;
+        $xajax_response = new xajaxResponse();
+        $return = '';
+        if (!empty($needle) && !empty($type)) {
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
 
-			$cond_course_code = '';
-			if (!empty($id_session)) {
-				$id_session = intval($id_session);
-				// check course_code from session_rel_course table
-				$sql = 'SELECT c_id FROM '.$tbl_session_rel_course.'
-						WHERE session_id = '.$id_session;
-				$res = Database::query($sql);
-				$course_codes = '';
-				if (Database::num_rows($res) > 0) {
-					while ($row = Database::fetch_row($res)) {
-						$course_codes .= '\''.$row[0].'\',';
-					}
-					$course_codes = substr($course_codes, 0, (strlen($course_codes) - 1));
-
-					$cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
-				}
-			}
+            $cond_course_code = '';
+            if (!empty($id_session)) {
+                $id_session = intval($id_session);
+                // check course_code from session_rel_course table
+                $sql = 'SELECT c_id FROM '.$tbl_session_rel_course.'
+                        WHERE session_id = '.$id_session;
+                $res = Database::query($sql);
+                $course_codes = '';
+                if (Database::num_rows($res) > 0) {
+                    while ($row = Database::fetch_row($res)) {
+                        $course_codes .= '\''.$row[0].'\',';
+                    }
+                    $course_codes = substr($course_codes, 0, (strlen($course_codes) - 1));
+                    $cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
+                }
+            }
 
             if ($type == 'single') {
-				// search users where username or firstname or lastname begins likes $needle
-				$sql = 'SELECT
+                // search users where username or firstname or lastname begins likes $needle
+                $sql = 'SELECT
                             course.id,
-						 	course.visual_code,
-						 	course.title,
-						 	session_rel_course.session_id
-						FROM '.$tbl_course.' course
-						LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
-							ON course.id = session_rel_course.c_id
-							AND session_rel_course.session_id = '.intval($id_session).'
-						WHERE
-							course.visual_code LIKE "'.$needle.'%" OR
-							course.title LIKE "'.$needle.'%"';
-			} else {
+                            course.visual_code,
+                            course.title,
+                            session_rel_course.session_id
+                        FROM '.$tbl_course.' course
+                        LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
+                            ON course.id = session_rel_course.c_id
+                            AND session_rel_course.session_id = '.intval($id_session).'
+                        WHERE
+                            course.visual_code LIKE "'.$needle.'%" OR
+                            course.title LIKE "'.$needle.'%"';
+            } else {
                 $sql = 'SELECT course.id, course.visual_code, course.title
-						FROM '.$tbl_course.' course
-						WHERE
-							course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.'
-						ORDER BY course.code ';
-			}
-
-			if (api_is_multiple_url_enabled()) {
-				$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-				$access_url_id = api_get_current_access_url_id();
-				if ($access_url_id != -1) {
+                        FROM '.$tbl_course.' course
+                        WHERE
+                            course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.'
+                        ORDER BY course.code ';
+            }
 
-					if ($type == 'single') {
-						$sql = 'SELECT
+            if (api_is_multiple_url_enabled()) {
+                $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+                $access_url_id = api_get_current_access_url_id();
+                if ($access_url_id != -1) {
+                    if ($type == 'single') {
+                        $sql = 'SELECT
                                     course.id,
-						            course.visual_code,
-						            course.title,
-						            session_rel_course.session_id
-								FROM '.$tbl_course.' course
-								LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
-									ON course.id = session_rel_course.c_id
-									AND session_rel_course.session_id = '.intval($id_session).'
-								INNER JOIN '.$tbl_course_rel_access_url.' url_course
-								ON (url_course.c_id = course.id)
-								WHERE
-									access_url_id = '.$access_url_id.' AND
-									(course.visual_code LIKE "'.$needle.'%" OR
-									course.title LIKE "'.$needle.'%" )';
-					} else {
+                                    course.visual_code,
+                                    course.title,
+                                    session_rel_course.session_id
+                                FROM '.$tbl_course.' course
+                                LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
+                                    ON course.id = session_rel_course.c_id
+                                    AND session_rel_course.session_id = '.intval($id_session).'
+                                INNER JOIN '.$tbl_course_rel_access_url.' url_course
+                                ON (url_course.c_id = course.id)
+                                WHERE
+                                    access_url_id = '.$access_url_id.' AND
+                                    (course.visual_code LIKE "'.$needle.'%" OR
+                                    course.title LIKE "'.$needle.'%" )';
+                    } else {
                         $sql = 'SELECT course.id, course.visual_code, course.title
-								FROM '.$tbl_course.' course, '.$tbl_course_rel_access_url.' url_course
-								WHERE
-									url_course.c_id = course.id AND
-									access_url_id = '.$access_url_id.' AND
-									course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.'
-								ORDER BY course.code ';
-					}
-				}
-			}
+                                FROM '.$tbl_course.' course, '.$tbl_course_rel_access_url.' url_course
+                                WHERE
+                                    url_course.c_id = course.id AND
+                                    access_url_id = '.$access_url_id.' AND
+                                    course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.'
+                                ORDER BY course.code ';
+                    }
+                }
+            }
 
-			$rs = Database::query($sql);
-			$course_list = array();
+            $rs = Database::query($sql);
+            $course_list = array();
             if ($type == 'single') {
-				while ($course = Database :: fetch_array($rs)) {
-					$course_list[] = $course['code'];
-					$course_title = str_replace("'", "\'", $course_title);
+                while ($course = Database :: fetch_array($rs)) {
+                    $course_list[] = $course['code'];
+                    $course_title = str_replace("'", "\'", $course_title);
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['id'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />';
-				}
-				$xajax_response -> addAssign('ajax_list_courses_single', 'innerHTML', api_utf8_encode($return));
-			} else {
-				$return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
-				while ($course = Database :: fetch_array($rs)) {
-					$course_list[] = $course['code'];
-					$course_title = str_replace("'", "\'", $course_title);
+                }
+                $xajax_response -> addAssign('ajax_list_courses_single', 'innerHTML', api_utf8_encode($return));
+            } else {
+                $return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
+                while ($course = Database :: fetch_array($rs)) {
+                    $course_list[] = $course['code'];
+                    $course_title = str_replace("'", "\'", $course_title);
                     $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')', ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';
-				}
-				$return .= '</select>';
-				$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
-			}
-		}
-		$_SESSION['course_list'] = $course_list;
+                }
+                $return .= '</select>';
+                $xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
+            }
+        }
+        $_SESSION['course_list'] = $course_list;
 
-		return $xajax_response;
-	}
+        return $xajax_response;
+    }
 }
diff --git a/main/inc/lib/add_many_session_to_category_functions.lib.php b/main/inc/lib/add_many_session_to_category_functions.lib.php
index 7803974ee4..676d397f13 100755
--- a/main/inc/lib/add_many_session_to_category_functions.lib.php
+++ b/main/inc/lib/add_many_session_to_category_functions.lib.php
@@ -25,29 +25,30 @@ class AddManySessionToCategoryFunctions
     function search_courses($needle,$type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-		$xajax_response = new xajaxResponse();
-		$return = '';
-		if(!empty($needle) && !empty($type)) {
-			// xajax send utf8 datas... datas in db can be non-utf8 datas
-			$charset = api_get_system_encoding();
-			$needle = api_convert_encoding($needle, $charset, 'utf-8');
-			$needle = Database::escape_string($needle);
+        $xajax_response = new xajaxResponse();
+        $return = '';
+        if (!empty($needle) && !empty($type)) {
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
+            $needle = Database::escape_string($needle);
+            $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
+            $rs = Database::query($sql);
+            $course_list = array();
+            $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
+            while ($course = Database :: fetch_array($rs)) {
+                $course_list[] = $course['id'];
+                $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+            }
+            $return .= '</select>';
+            $xajax_response->addAssign(
+                'ajax_list_courses_multiple',
+                'innerHTML',
+                api_utf8_encode($return)
+            );
+        }
+        $_SESSION['course_list'] = $course_list;
 
-			$sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
-
-			$rs = Database::query($sql);
-			$course_list = array();
-
-			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
-				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
-			}
-			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-		}
-		$_SESSION['course_list'] = $course_list;
-        
-		return $xajax_response;
-	}
+        return $xajax_response;
+    }
 }
diff --git a/main/inc/lib/app_view.php b/main/inc/lib/app_view.php
index a45d5b2284..25d4ff1f0e 100755
--- a/main/inc/lib/app_view.php
+++ b/main/inc/lib/app_view.php
@@ -13,10 +13,10 @@ class View
 
     /**
      * Constructor, init tool path for rendering
-     * @param string  tool name (optional)
+     * @param string $toolname tool name (optional)
      * @param string $template_path
      */
-    public function __construct($toolname = '', $template_path=null)
+    public function __construct($toolname = '', $template_path = null)
     {
         if (!empty($toolname)) {
             if (isset($template_path)) {
diff --git a/main/inc/lib/grade_model.lib.php b/main/inc/lib/grade_model.lib.php
index d1c6464d2f..9974766ad9 100755
--- a/main/inc/lib/grade_model.lib.php
+++ b/main/inc/lib/grade_model.lib.php
@@ -115,7 +115,7 @@ class GradeModel extends Model
         }
 
         $form->addElement('hidden', 'maxvalue', '100');
-		$form->addElement('hidden', 'minvalue', '0');
+        $form->addElement('hidden', 'minvalue', '0');
         $renderer = & $form->defaultRenderer();
 
         $component_array = array();
@@ -191,7 +191,7 @@ class GradeModel extends Model
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     /**
diff --git a/user_portal.php b/user_portal.php
index 6611afd430..b0278fb426 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -190,7 +190,9 @@ if (api_get_setting('go_to_course_after_login') == 'true') {
     if (!isset($_SESSION['coursesAlreadyVisited']) &&
         $count_of_sessions == 0 && $count_of_courses_no_sessions == 1
     ) {
-        $courses = CourseManager::get_courses_list_by_user_id($userId);
+        $courses = CourseManager::get_courses_list_by_user_id(
+            $userId
+        );
 
         if (!empty($courses) && isset($courses[0]) && isset($courses[0]['code'])) {
             $courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
@@ -205,7 +207,10 @@ if (api_get_setting('go_to_course_after_login') == 'true') {
 
 // Show the chamilo mascot
 if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
-	$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
+    $controller->tpl->assign(
+        'welcome_to_course_block',
+        $controller->return_welcome_to_course_block()
+    );
 }
 
 $controller->tpl->assign('content', $courseAndSessions['html']);

From 9b71ba59d490711e39bbca7705b8d2fc36b875d0 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 13:06:34 +0100
Subject: [PATCH 60/68] Add behat test + add id in career form in order to test
 with behat.

---
 main/inc/lib/promotion.lib.php              |  6 +++---
 tests/behat/features/career.feature         | 13 +++++++++++++
 tests/behat/features/class.feature          | 13 +++++++++++++
 tests/behat/features/extraFieldUser.feature | 14 ++++++++++++++
 tests/behat/features/promotion.feature      | 14 ++++++++++++++
 5 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 tests/behat/features/career.feature
 create mode 100644 tests/behat/features/class.feature
 create mode 100644 tests/behat/features/extraFieldUser.feature
 create mode 100644 tests/behat/features/promotion.feature

diff --git a/main/inc/lib/promotion.lib.php b/main/inc/lib/promotion.lib.php
index 4edbc068eb..5bde393054 100755
--- a/main/inc/lib/promotion.lib.php
+++ b/main/inc/lib/promotion.lib.php
@@ -239,11 +239,11 @@ class Promotion extends Model
         foreach ($careers as $item) {
             $career_list[$item['id']] = $item['name'];
         }
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'career_id',
             get_lang('Career'),
-            $career_list
+            $career_list,
+            ['id' => 'career_id']
         );
         $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
diff --git a/tests/behat/features/career.feature b/tests/behat/features/career.feature
new file mode 100644
index 0000000000..4efea80380
--- /dev/null
+++ b/tests/behat/features/career.feature
@@ -0,0 +1,13 @@
+Feature: Career
+    In order to use the Career
+    As an administrator
+    I need to be able to create a career
+
+  Scenario: Create a Career
+      Given I am a platform administrator
+      And I am on "/main/admin/careers.php?action=add"
+      When I fill in the following:
+          | name          | Developer               |
+      And I fill in ckeditor field "description" with "Description"
+      And I press "submit"
+      Then I should see "Item added"
diff --git a/tests/behat/features/class.feature b/tests/behat/features/class.feature
new file mode 100644
index 0000000000..02d9c85243
--- /dev/null
+++ b/tests/behat/features/class.feature
@@ -0,0 +1,13 @@
+Feature: Classes
+    In order to use the Classes
+    As an administrator
+    I need to be able to create a class
+
+  Scenario: Create a class
+      Given I am a platform administrator
+      And I am on "/main/admin/usergroups.php?action=add"
+      When I fill in the following:
+          | name          | Class 1               |
+          | description   | class description  |
+      And I press "submit"
+      Then I should see "Item added"
diff --git a/tests/behat/features/extraFieldUser.feature b/tests/behat/features/extraFieldUser.feature
new file mode 100644
index 0000000000..9ff76907fc
--- /dev/null
+++ b/tests/behat/features/extraFieldUser.feature
@@ -0,0 +1,14 @@
+Feature: User extra fields
+    In order to use the user extra fields
+    As an administrator
+    I need to be able to create an extra field
+
+  Scenario: Create a text extra field
+      Given I am a platform administrator
+      And I am on "/main/admin/extra_fields.php?type=user&action=add"
+      When I fill in the following:
+          | display_text          | Behat extra field               |
+          | variable      | behat_extra_field               |
+      And I fill in select bootstrap static input "#field_type" select "1"
+      And I press "submit"
+      Then I should see "Item added"
diff --git a/tests/behat/features/promotion.feature b/tests/behat/features/promotion.feature
new file mode 100644
index 0000000000..8fdfe28079
--- /dev/null
+++ b/tests/behat/features/promotion.feature
@@ -0,0 +1,14 @@
+Feature: Promotions
+    In order to use the promotion feature
+    As an administrator
+    I need to be able to create a promotion
+
+  Scenario: Create a Promotion
+      Given I am a platform administrator
+      And I am on "/main/admin/promotions.php?action=add"
+      When I fill in the following:
+          | name          | Promotion 2030               |
+      And I fill in ckeditor field "description" with "Promotion description"
+      And I fill in select bootstrap static input "#career_id" select "1"
+      And I press "submit"
+      Then I should see "Item added"

From 1a423c4bdec43f5425d6814b96dec32a423f0c23 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 17 Mar 2017 12:24:44 +0000
Subject: [PATCH 61/68] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 .../lib/formvalidator/FormValidator.class.php | 10 ++++----
 main/inc/lib/hook/HookManagement.php          |  2 +-
 main/inc/lib/link.lib.php                     | 15 +++++++++---
 main/inc/lib/login.lib.php                    |  3 ++-
 main/inc/lib/plugin.class.php                 | 10 ++++----
 main/inc/lib/thematic.lib.php                 |  9 ++++++-
 main/user/subscribe_user.php                  |  1 -
 main/user/user.php                            |  1 -
 main/webservices/access_url.php               |  3 +++
 .../Entity/AccessUrlRelUserGroup.php          |  2 +-
 src/Chamilo/CoreBundle/Entity/ChatVideo.php   |  8 +++----
 .../CoreBundle/Entity/CourseRelUser.php       |  2 +-
 src/Chamilo/CoreBundle/Entity/Language.php    |  2 +-
 src/Chamilo/CoreBundle/Entity/Message.php     |  2 +-
 .../CoreBundle/Entity/SequenceResource.php    |  4 ++--
 .../CoreBundle/Entity/SkillRelUser.php        |  4 ++--
 .../CoreBundle/Entity/SkillRelUserComment.php |  2 +-
 .../CourseBundle/Entity/CForumThread.php      |  2 +-
 .../FaqBundle/Entity/QuestionTranslation.php  |  4 ++--
 .../ThemeBundle/Model/MenuItemInterface.php   | 24 +++++++++----------
 20 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 2abbdf8ae7..37d8fb5143 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -233,8 +233,8 @@ EOT;
     }
 
     /**
-     * @param $name
-     * @param $label
+     * @param string $name
+     * @param string $label
      * @param array $options
      * @param array $attributes
      * @throws
@@ -1063,7 +1063,7 @@ EOT;
     /**
      * This function has been created for avoiding changes directly within QuickForm class.
      * When we use it, the element is threated as 'required' to be dealt during validation.
-     * @param array $element The array of elements
+     * @param array $elements The array of elements
      * @param string $message The message displayed
      */
     public function add_multiple_required_rule($elements, $message)
@@ -1339,12 +1339,12 @@ EOT;
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param $label
      * @param bool $required
      * @param array $attributes
      * @param bool $allowNegative
-     * @param null $minValue
+     * @param integer $minValue
      * @param null $maxValue
      */
     public function addFloat(
diff --git a/main/inc/lib/hook/HookManagement.php b/main/inc/lib/hook/HookManagement.php
index e07fcb0bc4..46d0da5d74 100644
--- a/main/inc/lib/hook/HookManagement.php
+++ b/main/inc/lib/hook/HookManagement.php
@@ -138,7 +138,7 @@ class HookManagement implements HookManagementInterface
 
     /**
      * Return a list an associative array where keys are the active hook observer class name
-     * @param $eventName
+     * @param string $eventName
      *
      * @return array
      */
diff --git a/main/inc/lib/link.lib.php b/main/inc/lib/link.lib.php
index 2acaace1d0..29f278367d 100755
--- a/main/inc/lib/link.lib.php
+++ b/main/inc/lib/link.lib.php
@@ -470,6 +470,7 @@ class Link extends Model
      *
      * Get link info
      * @param int link id
+     * @param integer $id
      * @return array link info
      *
      **/
@@ -854,7 +855,7 @@ class Link extends Model
     }
 
     /**
-     * @param $categoryId
+     * @param integer $categoryId
      * @param $courseId
      * @param $sessionId
      * @param bool $withBaseContent
@@ -941,8 +942,8 @@ class Link extends Model
      * @author Julio Montoya
      *
      * @param $catid
-     * @param $courseId
-     * @param $session_id
+     * @param integer $courseId
+     * @param integer $session_id
      * @return string
      */
     public static function showLinksPerCategory($catid, $courseId, $session_id)
@@ -1150,6 +1151,8 @@ class Link extends Model
     /**
      * Displays the edit, delete and move icons
      * @param int   Category ID
+     * @param integer $currentCategory
+     * @param integer $countCategories
      * @return string
      *
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
@@ -1290,6 +1293,7 @@ class Link extends Model
     /**
      * CSV file import functions
      * @author René Haentjens , Ghent University
+     * @param string $catname
      */
     public static function get_cat($catname)
     {
@@ -1324,6 +1328,11 @@ class Link extends Model
     /**
      * CSV file import functions
      * @author René Haentjens , Ghent University
+     * @param string $url
+     * @param string $title
+     * @param string $description
+     * @param string $on_homepage
+     * @param string $hidden
      */
     public static function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
     {
diff --git a/main/inc/lib/login.lib.php b/main/inc/lib/login.lib.php
index 24d38673c3..8f542be037 100755
--- a/main/inc/lib/login.lib.php
+++ b/main/inc/lib/login.lib.php
@@ -276,6 +276,7 @@ class Login
      * @global bool   $is_platformAdmin
      * @global bool   $is_allowedCreateCourse
      * @global object $_user
+     * @param boolean $reset
      */
     public static function init_user($user_id, $reset)
     {
@@ -366,7 +367,7 @@ class Login
      * @global type $is_allowed_in_course
      *
      * @param type $course_id
-     * @param type $reset
+     * @param boolean $reset
      */
     static function init_course($course_id, $reset)
     {
diff --git a/main/inc/lib/plugin.class.php b/main/inc/lib/plugin.class.php
index 2561c0735c..f89bed0f7a 100755
--- a/main/inc/lib/plugin.class.php
+++ b/main/inc/lib/plugin.class.php
@@ -150,7 +150,7 @@ class Plugin
 
     /**
      * Returns the contents of the CSS defined by the plugin
-     * @return array
+     * @return string
      */
     public function get_css()
     {
@@ -168,7 +168,7 @@ class Plugin
 
     /**
      * Returns an HTML form (generated by FormValidator) of the plugin settings
-     * @return string FormValidator-generated form
+     * @return FormValidator FormValidator-generated form
      */
     public function get_settings_form()
     {
@@ -390,7 +390,7 @@ class Plugin
      * @param boolean $add_tool_link Whether to add a tool link or not
      * (some tools might just offer a configuration section and act on the backend)
      *
-     * @return boolean  False on error, null otherwise
+     * @return boolean|null  False on error, null otherwise
      */
     public function install_course_fields($courseId, $add_tool_link = true)
     {
@@ -501,7 +501,7 @@ class Plugin
      * tool on the course's homepage
      * @param int $courseId
      *
-     * @return void
+     * @return false|null
      */
     public function uninstall_course_fields($courseId)
     {
@@ -607,7 +607,7 @@ class Plugin
     * @param string   $tabName
     * @param string   $url
     *
-    * @return boolean
+    * @return false|string
     */
     public function addTab($tabName, $url)
     {
diff --git a/main/inc/lib/thematic.lib.php b/main/inc/lib/thematic.lib.php
index f070b15592..39b44a71a5 100755
--- a/main/inc/lib/thematic.lib.php
+++ b/main/inc/lib/thematic.lib.php
@@ -242,6 +242,9 @@ class Thematic
     /**
      * get thematic list
      * @param	int		Thematic id (optional), get list by id
+     * @param integer $thematic_id
+     * @param string $course_code
+     * @param integer $session_id
      * @return	array	Thematic data
      */
     public static function get_thematic_list(
@@ -799,6 +802,7 @@ class Thematic
     /**
      * delete  thematic advance
      * @param	int		Thematic advance id
+     * @param integer $thematic_advance_id
      * @return	int		Affected rows
      */
     public function thematic_advance_destroy($thematic_advance_id)
@@ -1116,6 +1120,7 @@ class Thematic
     /**
      * update done thematic advances from thematic details interface
      * @param 	int		Thematic id
+     * @param integer $thematic_advance_id
      * @return	int		Affected rows
      */
     public function update_done_thematic_advances($thematic_advance_id)
@@ -1343,6 +1348,7 @@ class Thematic
      * Get average of advances by thematic
      * @param	int		Thematic id
      * @param	string	Course code (optional)
+     * @param string $course_code
      * @return 	float	Average of thematic advances
      */
     public function get_average_of_advances_by_thematic($thematic_id, $course_code = null)
@@ -1407,6 +1413,7 @@ class Thematic
      * @param	string	Content
      * @param	string	Date and time
      * @param	int		Duration in hours
+     * @param integer $id
      * @return void
      */
     public function set_thematic_advance_attributes(
@@ -1437,7 +1444,7 @@ class Thematic
 
     /**
      * get thematic id
-     * @return void
+     * @return integer
      */
     public function get_thematic_id()
     {
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index dbbe41ed95..8983220f0b 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -710,7 +710,6 @@ function reg_filter($user_id)
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $url_params
  * @return string Some HTML-code with the lock/unlock button
  */
diff --git a/main/user/user.php b/main/user/user.php
index 463bd2982d..a713fe1055 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -933,7 +933,6 @@ function get_user_data($from, $number_of_items, $column, $direction)
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $urlParams
  *
  * @return string Some HTML-code with the lock/unlock button
diff --git a/main/webservices/access_url.php b/main/webservices/access_url.php
index 9e6a9d4037..80c757b15f 100644
--- a/main/webservices/access_url.php
+++ b/main/webservices/access_url.php
@@ -17,6 +17,9 @@ define('WS_ERROR_NOT_FOUND_RESULT', 2);
 define('WS_ERROR_INVALID_INPUT', 3);
 define('WS_ERROR_SETTING', 4);
 
+/**
+ * @param integer $code
+ */
 function return_error($code) {
     $fault = null;
     switch ($code) {
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
index 3084e69981..0bc7f86cd9 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
@@ -40,7 +40,7 @@ class AccessUrlRelUserGroup
      * Set accessUrlId
      *
      * @param integer $accessUrlId
-     * @return AccessUrlRelUser
+     * @return AccessUrlRelUserGroup
      */
     public function setAccessUrlId($accessUrlId)
     {
diff --git a/src/Chamilo/CoreBundle/Entity/ChatVideo.php b/src/Chamilo/CoreBundle/Entity/ChatVideo.php
index dc99b6af90..23a77cc052 100644
--- a/src/Chamilo/CoreBundle/Entity/ChatVideo.php
+++ b/src/Chamilo/CoreBundle/Entity/ChatVideo.php
@@ -61,7 +61,7 @@ class ChatVideo
      * Set fromUser
      *
      * @param integer $fromUser
-     * @return Chat
+     * @return ChatVideo
      */
     public function setFromUser($fromUser)
     {
@@ -84,7 +84,7 @@ class ChatVideo
      * Set toUser
      *
      * @param integer $toUser
-     * @return Chat
+     * @return ChatVideo
      */
     public function setToUser($toUser)
     {
@@ -107,7 +107,7 @@ class ChatVideo
      * Set room_name
      *
      * @param string $roomName
-     * @return Chat
+     * @return ChatVideo
      */
     public function setRoomName($roomName)
     {
@@ -130,7 +130,7 @@ class ChatVideo
      * Set datetime
      *
      * @param \DateTime $datetime
-     * @return Chat
+     * @return ChatVideo
      */
     public function setDatetime($datetime)
     {
diff --git a/src/Chamilo/CoreBundle/Entity/CourseRelUser.php b/src/Chamilo/CoreBundle/Entity/CourseRelUser.php
index ad01696b59..9859d7a9d5 100644
--- a/src/Chamilo/CoreBundle/Entity/CourseRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/CourseRelUser.php
@@ -139,7 +139,7 @@ class CourseRelUser
     }
 
     /**
-     * @param $user
+     * @param User $user
      * @return $this
      */
     public function setUser($user)
diff --git a/src/Chamilo/CoreBundle/Entity/Language.php b/src/Chamilo/CoreBundle/Entity/Language.php
index d7f18e384b..efbb4471dd 100644
--- a/src/Chamilo/CoreBundle/Entity/Language.php
+++ b/src/Chamilo/CoreBundle/Entity/Language.php
@@ -231,7 +231,7 @@ class Language
     /**
      * Get id
      *
-     * @return boolean
+     * @return integer
      */
     public function getId()
     {
diff --git a/src/Chamilo/CoreBundle/Entity/Message.php b/src/Chamilo/CoreBundle/Entity/Message.php
index a98b6f8fce..37be84c8c0 100644
--- a/src/Chamilo/CoreBundle/Entity/Message.php
+++ b/src/Chamilo/CoreBundle/Entity/Message.php
@@ -320,7 +320,7 @@ class Message
      * Set votes
      *
      * @param integer $votes
-     * @return integer
+     * @return Message
      */
     public function setVotes($votes)
     {
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceResource.php b/src/Chamilo/CoreBundle/Entity/SequenceResource.php
index 505142da98..7a88e4aca7 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceResource.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceResource.php
@@ -58,7 +58,7 @@ class SequenceResource
     }
 
     /**
-     * @return string
+     * @return integer
      */
     public function getType()
     {
@@ -123,7 +123,7 @@ class SequenceResource
     }
 
     /**
-     * @param mixed $sequence
+     * @param Sequence $sequence
      * @return $this
      */
     public function setSequence(Sequence $sequence)
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelUser.php b/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
index a82a58a448..acb5b5d140 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
@@ -121,7 +121,7 @@ class SkillRelUser
 
     /**
      * Get user
-     * @return \User
+     * @return User
      */
     public function getUser()
     {
@@ -390,7 +390,7 @@ class SkillRelUser
 
     /**
      * Calculate the average value from the feedback comments
-     * @return int
+     * @return string
      */
     public function getAverage()
     {
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php b/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php
index 1554d7ece1..273f52a653 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php
@@ -108,7 +108,7 @@ class SkillRelUserComment
 
     /**
      * Get feedbackDateTime
-     * @return type
+     * @return \DateTime
      */
     public function getFeedbackDateTime()
     {
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThread.php b/src/Chamilo/CourseBundle/Entity/CForumThread.php
index 6122a04a23..145150a653 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThread.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThread.php
@@ -181,7 +181,7 @@ class CForumThread
 
     /**
      * set threadPeerQualify
-     * @param $threadPeerQualify
+     * @param integer $threadPeerQualify
      * @return $this
      */
     public function setThreadPeerQualify($threadPeerQualify)
diff --git a/src/Chamilo/FaqBundle/Entity/QuestionTranslation.php b/src/Chamilo/FaqBundle/Entity/QuestionTranslation.php
index 87f2c1b4b5..230938ac55 100644
--- a/src/Chamilo/FaqBundle/Entity/QuestionTranslation.php
+++ b/src/Chamilo/FaqBundle/Entity/QuestionTranslation.php
@@ -58,7 +58,7 @@ class QuestionTranslation
 
     /**
      * @param string $headline
-     * @return CategoryTranslation
+     * @return QuestionTranslation
      */
     public function setHeadline($headline)
     {
@@ -77,7 +77,7 @@ class QuestionTranslation
 
     /**
      * @param string $body
-     * @return CategoryTranslation
+     * @return QuestionTranslation
      */
     public function setBody($body)
     {
diff --git a/src/Chamilo/ThemeBundle/Model/MenuItemInterface.php b/src/Chamilo/ThemeBundle/Model/MenuItemInterface.php
index ccb6aa67d8..04a7fe7c58 100644
--- a/src/Chamilo/ThemeBundle/Model/MenuItemInterface.php
+++ b/src/Chamilo/ThemeBundle/Model/MenuItemInterface.php
@@ -20,29 +20,29 @@ interface MenuItemInterface {
     public function getIdentifier();
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getLabel();
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getRoute();
 
     /**
-     * @return mixed
+     * @return boolean
      */
     public function isActive();
 
     /**
-     * @param $isActive
+     * @param boolean $isActive
      *
-     * @return mixed
+     * @return MenuItemModel
      */
     public function setIsActive($isActive);
 
     /**
-     * @return mixed
+     * @return boolean
      */
     public function hasChildren();
 
@@ -54,14 +54,14 @@ interface MenuItemInterface {
     /**
      * @param MenuItemInterface $child
      *
-     * @return mixed
+     * @return MenuItemModel
      */
     public function addChild(MenuItemInterface $child);
 
     /**
      * @param MenuItemInterface $child
      *
-     * @return mixed
+     * @return MenuItemModel
      */
     public function removeChild(MenuItemInterface $child);
 
@@ -76,24 +76,24 @@ interface MenuItemInterface {
     public function getBadge();
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getBadgeColor();
 
     /**
-     * @return mixed
+     * @return MenuItemInterface
      */
     public function getParent();
 
     /**
-     * @return mixed
+     * @return boolean
      */
     public function hasParent();
 
     /**
      * @param MenuItemInterface $parent
      *
-     * @return mixed
+     * @return MenuItemModel
      */
     public function setParent(MenuItemInterface $parent = null);
 

From 3f5bb90ae99554fdbc5f0867f5b91d80b461cbad Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 14:16:54 +0100
Subject: [PATCH 62/68] Add security::remove_XSS see BT#12486

---
 main/work/work.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index b26134cd0c..0c9aa325f9 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -2045,6 +2045,7 @@ function get_work_user_list(
                 );
                 $work['title_clean'] = $work['title'];
 
+                $work['title'] = Security::remove_XSS($work['title']);
                 if (strlen($work['title']) > 30) {
                     $short_title = substr($work['title'], 0, 27).'...';
                     $work['title'] = Display::span($short_title, array('class' => 'work-title', 'title' => $work['title']));

From f8daa46ba53f952ac77072b91edc4b012d3f2d0f Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 14:59:16 +0100
Subject: [PATCH 63/68] Remove echo

---
 main/inc/lib/TicketManager.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main/inc/lib/TicketManager.php b/main/inc/lib/TicketManager.php
index bcc90dd9ed..1ade54b060 100644
--- a/main/inc/lib/TicketManager.php
+++ b/main/inc/lib/TicketManager.php
@@ -1567,7 +1567,6 @@ class TicketManager
                 WHERE ticket_id = $ticketId
                 ORDER BY assigned_date DESC";
         $result = Database::query($sql);
-        echo $sql;
         $history = [];
         $webpath = api_get_path(WEB_PATH);
         while ($row = Database::fetch_assoc($result)) {

From 157754fd77d393688a9574c52390a72448231012 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 17 Mar 2017 15:08:28 +0100
Subject: [PATCH 64/68] Add assign log.

---
 main/inc/lib/TicketManager.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/main/inc/lib/TicketManager.php b/main/inc/lib/TicketManager.php
index 1ade54b060..993c6d4a52 100644
--- a/main/inc/lib/TicketManager.php
+++ b/main/inc/lib/TicketManager.php
@@ -594,6 +594,15 @@ class TicketManager
                     WHERE id = $ticketId";
             Database::query($sql);
 
+            $table = Database::get_main_table(TABLE_TICKET_ASSIGNED_LOG);
+            $params = [
+                'ticket_id' => $ticketId,
+                'user_id' => $userId,
+                'sys_insert_user_id' => api_get_user_id(),
+                'assigned_date' => api_get_utc_datetime()
+            ];
+            Database::insert($table, $params);
+
             return true;
         } else {
             return false;

From d9a0fae005b1b503c618451d6d9112455f1319eb Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 17 Mar 2017 13:14:34 -0500
Subject: [PATCH 65/68] Minor - format code - refs BT#12441

---
 main/course_progress/thematic.php | 88 +++++++++++++++++--------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php
index 48248a38db..bcbbf6a29c 100755
--- a/main/course_progress/thematic.php
+++ b/main/course_progress/thematic.php
@@ -2,11 +2,11 @@
 /* For licensing terms, see /license.txt */
 
 /**
-* View (MVC patter) for thematic control
-* @author Christian Fasanando <christian1827@gmail.com>
-* @author Julio Montoya <gugli100@gmail.com> Bug fixing
-* @package chamilo.course_progress
-*/
+ * View (MVC patter) for thematic control
+ * @author Christian Fasanando <christian1827@gmail.com>
+ * @author Julio Montoya <gugli100@gmail.com> Bug fixing
+ * @package chamilo.course_progress
+ */
 
 // protect a course script
 api_protect_course_script(true);
@@ -23,25 +23,25 @@ if (api_is_allowed_to_edit(null, true)) {
         case 'thematic_add':
         case 'thematic_import_select':
             echo '<a href="index.php?'.api_get_cidreq().'">'.
-                Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ThematicDetails'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         case 'thematic_list':
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         case 'thematic_details':
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_import_select'.$url_token.'">'.
-                Display::return_icon('import_csv.png',get_lang('ImportThematic'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export'.$url_token.'">'.
-                Display::return_icon('export_csv.png',get_lang('ExportThematic'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('export_csv.png', get_lang('ExportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export_pdf'.$url_token.'">'.
-                Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         default:
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     echo '</div>';
 }
@@ -55,7 +55,7 @@ if ($action == 'thematic_list') {
 
     $parameters['action'] = $action;
     $table->set_additional_parameters($parameters);
-    $table->set_header(0, '', false, array('style'=>'width:20px;'));
+    $table->set_header(0, '', false, array('style' => 'width:20px;'));
     $table->set_header(1, get_lang('Title'), false);
     if (api_is_allowed_to_edit(null, true)) {
         $table->set_header(
@@ -64,7 +64,7 @@ if ($action == 'thematic_list') {
             false,
             array('style' => 'text-align:center;width:40%;')
         );
-        $table->set_form_actions(array ('thematic_delete_select' => get_lang('DeleteAllThematics')));
+        $table->set_form_actions(array('thematic_delete_select' => get_lang('DeleteAllThematics')));
     }
     $table->display();
 
@@ -75,11 +75,11 @@ if ($action == 'thematic_list') {
 
     if (isset($last_id) && $last_id) {
         $link_to_thematic_plan = '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$last_id.'">'.
-            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style' => 'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
         $link_to_thematic_advance = '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$last_id.'">'.
-            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style' => 'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
         Display::display_confirmation_message(
-            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance),
+            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'), $link_to_thematic_plan, $link_to_thematic_advance),
             false
         );
     }
@@ -119,35 +119,41 @@ if ($action == 'thematic_list') {
                     Display::return_icon('cd.gif', get_lang('Copy')),
                     'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token
                 );
-                if (api_get_session_id() == 0 ) {
+                if (api_get_session_id() == 0) {
                     if ($thematic['display_order'] > 1) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions_first_col .= ' '.Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions_first_col .= ' '.Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions_first_col .= ' '.Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions_first_col .= ' '.Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                 }
                 if (api_get_session_id() == $thematic['session_id']) {
-                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='
+                        .$my_thematic_id.$params.$url_token.'">'
+                        .Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''
+                        .get_lang('AreYouSureToDelete')
+                        .'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='
+                        .$my_thematic_id.$params.$url_token.'">'
+                        .Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                 }
 
-                $actions_first_col = Display::div($actions_first_col, array('id'=>'thematic_id_content_'.$thematic['id'], 'class'=>'thematic_tools'));
-                $actions_first_col = Display::div($actions_first_col, array('style'=>'height:20px'));
+                $actions_first_col = Display::div($actions_first_col, array('id' => 'thematic_id_content_'.$thematic['id'], 'class' => 'thematic_tools'));
+                $actions_first_col = Display::div($actions_first_col, array('style' => 'height:20px'));
             }
 
-            echo Display::tag('td', Display::tag('h3', Security::remove_XSS($thematic['title'], STUDENT).$session_star).Security::remove_XSS($thematic['content'], STUDENT).$actions_first_col, array('id'=>'thematic_td_content_'.$thematic['id'], 'class'=>'thematic_content'));
+            echo Display::tag('td', Display::tag('h3', Security::remove_XSS($thematic['title'], STUDENT).$session_star).Security::remove_XSS($thematic['content'], STUDENT).$actions_first_col, array('id' => 'thematic_td_content_'.$thematic['id'], 'class' => 'thematic_content'));
 
             // Display 2nd column - thematic plan data
             echo '<td>';
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
-                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'),ICON_SIZE_MEDIUM).'</a></div><br />';
+                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style' => 'vertical-align:middle'), ICON_SIZE_MEDIUM).'</a></div><br />';
             }
 
             if (empty($thematic_plan_div[$thematic['id']])) {
@@ -163,7 +169,7 @@ if ($action == 'thematic_list') {
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&action=thematic_advance_add&thematic_id='.$thematic['id'].'">'.
-                    Display::return_icon('add.png',get_lang('NewThematicAdvance'),'',ICON_SIZE_MEDIUM).'</a></div>';
+                    Display::return_icon('add.png', get_lang('NewThematicAdvance'), '', ICON_SIZE_MEDIUM).'</a></div>';
             }
 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
@@ -184,24 +190,24 @@ if ($action == 'thematic_list') {
                                 [],
                                 ICON_SIZE_SMALL
                             ),
-                            'index.php?' . api_get_cidreq() . '&' . http_build_query([
+                            'index.php?'.api_get_cidreq().'&'.http_build_query([
                                 'action' => 'thematic_advance_edit',
                                 'thematic_id' => $thematic['id'],
                                 'thematic_advance_id' => $thematic_advance['id']
                             ])
                         );
                         $edit_link .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a></center>';
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a></center>';
 
                         // Links
                         $edit_link = Display::div(
-                            Display::div($edit_link, array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
-                            array('style'=>'height:20px;')
+                            Display::div($edit_link, array('id' => 'thematic_advance_tools_'.$thematic_advance['id'], 'class' => 'thematic_advance_actions')),
+                            array('style' => 'height:20px;')
                         );
                     }
 
                     $thematic_advance_item = isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
-                    echo Display::div($thematic_advance_item, array('id'=>'thematic_advance_'.$thematic_advance['id']));
+                    echo Display::div($thematic_advance_item, array('id' => 'thematic_advance_'.$thematic_advance['id']));
                     echo $edit_link;
                     echo '</td>';
 
@@ -244,7 +250,7 @@ if ($action == 'thematic_list') {
     }
 } elseif ($action == 'thematic_add' || $action == 'thematic_edit') {
     // Display form
-    $form = new FormValidator('thematic_add','POST','index.php?action=thematic_add&'.api_get_cidreq());
+    $form = new FormValidator('thematic_add', 'POST', 'index.php?action=thematic_add&'.api_get_cidreq());
     if ($action == 'thematic_edit') {
         $form->addElement('header', '', get_lang('EditThematicSection'));
     }
@@ -253,10 +259,10 @@ if ($action == 'thematic_list') {
     $form->addElement('hidden', 'action', $action);
 
     if (!empty($thematic_id)) {
-        $form->addElement('hidden', 'thematic_id',$thematic_id);
+        $form->addElement('hidden', 'thematic_id', $thematic_id);
     }
 
-    $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
+    $form->addText('title', get_lang('Title'), true, array('size' => '50'));
     $form->addHtmlEditor('content', get_lang('Content'), false, false, array('ToolbarSet' => 'TrainingDescription', 'Height' => '150'));
     $form->addButtonSave(get_lang('Save'));
 
@@ -265,8 +271,8 @@ if ($action == 'thematic_list') {
     if (!empty($thematic_data)) {
         if (api_get_session_id()) {
             if ($thematic_data['session_id'] != api_get_session_id()) {
-                $show_form  = false;
-                Display::display_error_message(get_lang('NotAllowedClickBack'),false);
+                $show_form = false;
+                Display::display_error_message(get_lang('NotAllowedClickBack'), false);
             }
         }
         // set default values
@@ -277,14 +283,14 @@ if ($action == 'thematic_list') {
 
     // error messages
     if (isset($error)) {
-        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
     }
     if ($show_form) {
         $form->display();
     }
 } elseif ($action == 'thematic_import_select') {
     // Create form to upload csv file.
-    $form = new FormValidator('thematic_import','POST','index.php?action=thematic_import&'.api_get_cidreq().$url_token);
+    $form = new FormValidator('thematic_import', 'POST', 'index.php?action=thematic_import&'.api_get_cidreq().$url_token);
     $form->addElement('header', get_lang('ImportThematic'));
     $form->addElement('file', 'file');
     $form->addElement('checkbox', 'replace', null, get_lang('DeleteAllThematic'));

From 654fb09347462e2270a5d97fddef3ce0693cb3b7 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 17 Mar 2017 13:34:03 -0500
Subject: [PATCH 66/68] Allow export to pdf single thematic plan - refs
 BT#12441

---
 main/course_progress/index.php               |  4 ++-
 main/course_progress/thematic.php            |  7 ++++
 main/course_progress/thematic_controller.php | 38 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/main/course_progress/index.php b/main/course_progress/index.php
index 28a016610b..776e8af38c 100755
--- a/main/course_progress/index.php
+++ b/main/course_progress/index.php
@@ -43,7 +43,8 @@ $actions = array(
     'thematic_advance_list',
     'thematic_advance_add',
     'thematic_advance_edit',
-    'thematic_advance_delete'
+    'thematic_advance_delete',
+    'export_single_thematic'
 );
 
 $action  = 'thematic_details';
@@ -269,6 +270,7 @@ switch ($action) {
     case 'thematic_export':
     case 'thematic_export_pdf':
     case 'thematic_details':
+    case 'export_single_thematic':
         $thematic_controller->thematic($action);
         break;
     case 'thematic_plan_add':
diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php
index bcbbf6a29c..635984e6f1 100755
--- a/main/course_progress/thematic.php
+++ b/main/course_progress/thematic.php
@@ -132,6 +132,13 @@ if ($action == 'thematic_list') {
                     }
                 }
                 if (api_get_session_id() == $thematic['session_id']) {
+                    $actions_first_col .= Display::url(
+                        Display::return_icon('pdf.png'),
+                        api_get_self().'?'.api_get_cidreq()."$url_token&".http_build_query([
+                            'action' => 'export_single_thematic',
+                            'thematic_id' => $my_thematic_id
+                        ])
+                    );
                     $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='
                         .$my_thematic_id.$params.$url_token.'">'
                         .Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php
index 7329ec4ebe..77ffb7a4f9 100755
--- a/main/course_progress/thematic_controller.php
+++ b/main/course_progress/thematic_controller.php
@@ -236,6 +236,44 @@ class ThematicController
                     );
                     Export::export_table_pdf($table, $params);
                     break;
+                case 'export_single_thematic':
+                    $theme = $thematic->get_thematic_list($thematic_id);
+                    $table = array();
+                    $table[] = array(
+                        get_lang('Thematic'),
+                        get_lang('ThematicPlan'),
+                        get_lang('ThematicAdvance')
+                    );
+                    $data = $thematic->get_thematic_plan_data($theme['id']);
+                    $plan_html = null;
+                    if (!empty($data)) {
+                        foreach ($data as $plan) {
+                            if (empty($plan['description'])) {
+                                continue;
+                            }
+
+                            $plan_html .= '<h6>' . $plan['title'] . '</h6>' . $plan['description'] . '<br />';
+                        }
+                    }
+                    $data = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
+                    $advance_html = null;
+                    if (!empty($data)) {
+                        foreach ($data as $advance) {
+                            $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG)
+                                .' ('.$advance['duration'].' '.get_lang('HourShort').')'
+                                .'<br />'.$advance['content'].'<br />';
+                        }
+                    }
+                    $table[] = array($theme['title'], $plan_html, $advance_html);
+                    $params = array(
+                        'filename' => get_lang('Thematic') . '-' . api_get_local_time(),
+                        'pdf_title' => get_lang('Thematic'),
+                        'add_signatures' => true,
+                        'format' => 'A4-L',
+                        'orientation' => 'L'
+                    );
+                    Export::export_table_pdf($table, $params);
+                    break;
                 case 'moveup':
                     $thematic->move_thematic('up', $thematic_id);
                     $action = 'thematic_details';

From 4a36783f7b9064f027d763a72422b02b4738870f Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Fri, 17 Mar 2017 15:37:29 -0500
Subject: [PATCH 67/68] Recover important packaging scripts removed by mistake
 in 8fd4492cff

---
 tests/scripts/packaging/README.md  |  12 +++
 tests/scripts/packaging/gitlog.php | 126 +++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 tests/scripts/packaging/README.md
 create mode 100644 tests/scripts/packaging/gitlog.php

diff --git a/tests/scripts/packaging/README.md b/tests/scripts/packaging/README.md
new file mode 100644
index 0000000000..fe58148a08
--- /dev/null
+++ b/tests/scripts/packaging/README.md
@@ -0,0 +1,12 @@
+Git log script to pre-generate changelog
+========================================
+
+This directory only hosts a script to pre-generate the changelog for Chamilo.
+To work properly, it requires you to download Yannick Warnier's version of
+the php-git wrapper by the witty Sebastian Bergmann (author of PHP Unit, along
+other things): `git clone https://github.com/ywarnier/git php-git`.
+
+This should give you all you need to then launch 
+`php gitlog.php > /tmp/changelog` 
+and then copy-paste it to the Chamilo changelog (it still requires a careful
+manual review, but it already saves *a lot* of time).
\ No newline at end of file
diff --git a/tests/scripts/packaging/gitlog.php b/tests/scripts/packaging/gitlog.php
new file mode 100644
index 0000000000..c338924458
--- /dev/null
+++ b/tests/scripts/packaging/gitlog.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * This script pre-generates a list of commits to generate a changelog in the
+ * form (branch, then commits in HTML form, then a final feedback):
+ *
+ * @example
+ * 1.9.x
+ * <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/7333997ce358870bac139d15816dcaa7dd7794fa">7333997c</a> - <a href="https://task.beeznest.com/issues/8680">BT#8680</a>) Fixing custom lost password to work as classic Chamilo</li>
+ * ...
+ * <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/acdc14c47997315b151efda9a530c47a53100d68">acdc14c4</a> - <a href="https://task.beeznest.com/issues/8676">BT#8676</a>) Adding unique email validation option</li>
+ * Printed 367 commits of 500 requested (others were minor)
+ *
+ * @author Yannick Warnier <yannick.warnier@beeznest.com>
+ */
+/**
+ * Includes a modified version of Git lib by Sebastian Bergmann of PHPUnit
+ * @see https://github.com/ywarnier/git
+ */
+require 'php-git/src/Git.php';
+$repository = __DIR__.'/../..';
+$number = 500; //the number of commits to check (including minor)
+$formatHTML = true;
+$showDate = false;
+$endCommit = false;
+if (!empty($argv[1])) {
+    if ($argv[1] == '-t') {
+        $showDate = true;
+    } else {
+        $endCommit = $argv[1];
+        echo "End commit has been defined as ".$endCommit.PHP_EOL;
+    }
+}
+
+$git = new \SebastianBergmann\Git\Git($repository);
+echo "Log from branch: ".$git->getCurrentBranch().PHP_EOL;
+
+$logs = $git->getRevisions('DESC', $number);
+$i = 0;
+foreach ($logs as $log) {
+    if ($showDate) {
+        echo $log['date']->format('Y-m-d H:i:s').' '.substr($log['sha1'],0,8).PHP_EOL;
+    }
+    // Check for Minor importance messages to ignore...
+    if (strncasecmp($log['message'], 'Minor', 5) === 0) {
+        //Skip minor messages
+        continue;
+    }
+    //Skip language update messages (not important)
+    $langMsg = array(
+        'Update language terms',
+        'Update language vars',
+        'Update lang vars',
+        'Merge',
+        'merge'
+    );
+    foreach ($langMsg as $msg) {
+        if (strpos($log['message'], $msg) === 0) {
+            continue 2;
+        }
+    }
+    // Look for tasks references
+    $issueLink = '';
+    $matches = array();
+    if (preg_match_all('/((BT)?#(\d){2,5})/', $log['message'], $matches)) {
+        $issue = $matches[0][0];
+        if (substr($issue, 0, 1) == '#') {
+            // not a BeezNest task
+            $num = substr($issue, 1);
+            if ($num > 4000) {
+                //should be Chamilo support site
+                if ($formatHTML) {
+                    $issueLink = ' - <a href="https://support.chamilo.org/issues/' . $num . '">CT#' . $num . '</a>';
+                } else {
+                    $issueLink = ' - ' . $num;
+                }
+            } else {
+                //should be Github
+                if ($formatHTML) {
+                    $issueLink = ' - <a href="https://github.com/chamilo/chamilo-lms/issues/' . $num . '">GH#' . $num . '</a>';
+                } else {
+                    $issueLink = ' - ' . $num;
+                }
+            }
+        } else {
+            $num = substr($issue, 3);
+            if ($num != '7683') {
+                if ($formatHTML) {
+                    //7683 is an internal task at BeezNest for all general contributions to Chamilo - no use in adding this reference
+                    $issueLink = ' - <a href="https://task.beeznest.com/issues/' . $num . '">BT#' . $num . '</a>';
+                } else {
+                    $issueLink = ' - ' . $num;
+                }
+            }
+        }
+        if ($hasRefs = stripos($log['message'], ' see '.$issue)) {
+            $log['message'] = substr($log['message'], 0, $hasRefs);
+        }
+        if ($hasRefs = stripos($log['message'], ' - ref')) {
+            $log['message'] = substr($log['message'], 0, $hasRefs);
+        }
+        if ($hasRefs = stripos($log['message'], ' -refs ')) {
+            $log['message'] = substr($log['message'], 0, $hasRefs);
+        }
+
+    }
+    $commitLink = '';
+    if ($formatHTML) {
+        $log['message'] = ucfirst($log['message']);
+        $commitLink = '<a href="https://github.com/chamilo/chamilo-lms/commit/' . $log['sha1'] . '">' .
+            substr($log['sha1'], 0, 8) . '</a>';
+        echo '<li>('.$commitLink.$issueLink.') '.$log['message'].'</li>'.PHP_EOL;
+    } else {
+        $commitLink = substr($log['sha1'], 0, 8);
+        echo '('.$commitLink.$issueLink.') '.$log['message'].''.PHP_EOL;
+    }
+    // check end commit to stop processing
+    if ($endCommit) {
+        $length = strlen($endCommit);
+        if (substr($log['sha1'], 0, $length) == $endCommit) {
+            echo "Found the end commit ".$endCommit.", exiting...".PHP_EOL;
+            break;
+        }
+    }
+    $i++;
+}
+echo "Printed $i commits of $number requested (others were minor)".PHP_EOL;

From 5bbd101f216cbb7731b573be932ae545e5b96e87 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 17 Mar 2017 23:27:31 +0100
Subject: [PATCH 68/68] Scrutinizer Auto-Fixes (#1763)

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 main/course_progress/index.php               | 26 ++++++++++----------
 main/course_progress/thematic_controller.php | 16 ++++++------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/main/course_progress/index.php b/main/course_progress/index.php
index 776e8af38c..0c900967f2 100755
--- a/main/course_progress/index.php
+++ b/main/course_progress/index.php
@@ -47,7 +47,7 @@ $actions = array(
     'export_single_thematic'
 );
 
-$action  = 'thematic_details';
+$action = 'thematic_details';
 if (isset($_REQUEST['action']) && in_array($_REQUEST['action'], $actions)) {
     $action = $_REQUEST['action'];
 }
@@ -181,7 +181,7 @@ function check_per_custom_date(obj) {
 $thematicControl = Session::read('thematic_control');
 
 if ($action == 'thematic_list') {
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicControl'));
 }
 if ($action == 'thematic_add') {
     $interbreadcrumb[] = array(
@@ -195,10 +195,10 @@ if ($action == 'thematic_edit') {
         'url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl,
         'name' => get_lang('ThematicControl')
     );
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('EditThematicSection'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditThematicSection'));
 }
 if ($action == 'thematic_details') {
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicControl'));
 }
 if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') {
     $interbreadcrumb[] = array(
@@ -213,22 +213,22 @@ if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') {
     }
 }
 if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') {
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].')');
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].')');
     if ($description_type >= ADD_THEMATIC_PLAN) {
-        $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewBloc'));
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewBloc'));
     } else {
-        $interbreadcrumb[] = array ('url' => '#', 'name' => $default_thematic_plan_title[$description_type]);
+        $interbreadcrumb[] = array('url' => '#', 'name' => $default_thematic_plan_title[$description_type]);
     }
 }
 if ($action == 'thematic_advance_list' || $action == 'thematic_advance_delete') {
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
 }
 if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewThematicAdvance'));
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewThematicAdvance'));
 }
 
 if ($action == 'thematic_plan_list') {
diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php
index 77ffb7a4f9..7c42cf1a6f 100755
--- a/main/course_progress/thematic_controller.php
+++ b/main/course_progress/thematic_controller.php
@@ -215,20 +215,20 @@ class ThematicController
                                     continue;
                                 }
 
-                                $plan_html .= '<strong>' . $plan['title'] . '</strong><br /> ' . $plan['description'] . '<br />';
+                                $plan_html .= '<strong>'.$plan['title'].'</strong><br /> '.$plan['description'].'<br />';
                             }
                         }
                         $data = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
                         $advance_html = null;
                         if (!empty($data)) {
                             foreach ($data as $advance) {
-                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG) . ' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
+                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG).' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
                             }
                         }
                         $table[] = array($theme['title'], $plan_html, $advance_html);
                     }
                     $params = array(
-                        'filename' => get_lang('Thematic') . '-' . api_get_local_time(),
+                        'filename' => get_lang('Thematic').'-'.api_get_local_time(),
                         'pdf_title' => get_lang('Thematic'),
                         'add_signatures' => true,
                         'format' => 'A4-L',
@@ -252,7 +252,7 @@ class ThematicController
                                 continue;
                             }
 
-                            $plan_html .= '<h6>' . $plan['title'] . '</h6>' . $plan['description'] . '<br />';
+                            $plan_html .= '<h6>'.$plan['title'].'</h6>'.$plan['description'].'<br />';
                         }
                     }
                     $data = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
@@ -266,7 +266,7 @@ class ThematicController
                     }
                     $table[] = array($theme['title'], $plan_html, $advance_html);
                     $params = array(
-                        'filename' => get_lang('Thematic') . '-' . api_get_local_time(),
+                        'filename' => get_lang('Thematic').'-'.api_get_local_time(),
                         'pdf_title' => get_lang('Thematic'),
                         'add_signatures' => true,
                         'format' => 'A4-L',
@@ -361,8 +361,8 @@ class ThematicController
                                 $thematic->thematic_plan_save();
                             }
 
-                            $saveRedirect = api_get_path(WEB_PATH) . 'main/course_progress/index.php?';
-                            $saveRedirect.= api_get_cidreq() . '&';
+                            $saveRedirect = api_get_path(WEB_PATH).'main/course_progress/index.php?';
+                            $saveRedirect .= api_get_cidreq().'&';
 
                             if (isset($_REQUEST['add_item'])) {
                                 $thematic->set_thematic_plan_attributes(
@@ -378,7 +378,7 @@ class ThematicController
                                     'thematic_id' => $_REQUEST['thematic_id']
                                 ]);
                             } else {
-                                $saveRedirect.= 'thematic_plan_save_message=ok';
+                                $saveRedirect .= 'thematic_plan_save_message=ok';
 
                                 unset($_SESSION['thematic_plan_token']);
                                 $data['message'] = 'ok';