Modified and Created new file test and tested new functions in Chamilo

main/admin/access_url_edit_courses_to_url.php

@@ -35,7 +35,8 @@ $cidReset=true;
 require('../inc/global.inc.php');
 
 require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
-require_once ('../inc/lib/xajax/xajax.inc.php');
+require_once (api_get_path(LIBRARY_PATH).'access_url_edit_courses_to_url_functions.lib.php');
+
 $xajax = new xajax();
 //$xajax->debugOn();
 $xajax -> registerFunction ('search_courses');
@@ -70,39 +71,6 @@ if(isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!=''){
 	$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
 }
 
-function search_courses($needle, $id)
-{
-	global $tbl_course;
-	$xajax_response = new XajaxResponse();
-	$return = '';
-
-	if(!empty($needle)) {
-		// xajax send utf8 datas... datas in db can be non-utf8 datas
-		$charset = api_get_setting('platform_charset');
-		$needle = api_convert_encoding($needle, $charset, 'utf-8');
-		$needle = Database::escape_string($needle);
-		// search courses where username or firstname or lastname begins likes $needle
-		$sql = 'SELECT code, title FROM '.$tbl_course.' u
-				WHERE (title LIKE "'.$needle.'%"
-				OR code LIKE "'.$needle.'%"
-				)
-				ORDER BY title, code
-				LIMIT 11';
-		$rs = Database::query($sql, __FILE__, __LINE__);
-        $i=0;
-		while ($course = Database :: fetch_array($rs)) {
-			$i++;
-            if ($i<=10) {
-			     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
-            } else {
-            	$return .= '...<br />';
-            }
-		}
-	}
-	$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
-	return $xajax_response;
-}
-
 $xajax -> processRequests();
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
 $htmlHeadXtra[] = '

main/admin/access_url_edit_sessions_to_url.php

@@ -35,7 +35,8 @@ $cidReset=true;
 require('../inc/global.inc.php');
 
 require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
-require_once ('../inc/lib/xajax/xajax.inc.php');
+require_once (api_get_path(LIBRARY_PATH).'access_url_edit_sessions_to_url_functions.lib.php');
+
 $xajax = new xajax();
 //$xajax->debugOn();
 $xajax -> registerFunction ('search_sessions');
@@ -69,36 +70,6 @@ if(isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!=''){
 	$access_url_id = Security::remove_XSS(intval($_REQUEST['access_url_id']));
 }
 
-function search_sessions($needle, $id)
-{
-	global $tbl_session;
-	$xajax_response = new XajaxResponse();
-	$return = '';
-
-	if(!empty($needle)) {
-		// xajax send utf8 datas... datas in db can be non-utf8 datas
-		$charset = api_get_setting('platform_charset');
-		$needle = api_convert_encoding($needle, $charset, 'utf-8');
-		$needle = Database::escape_string($needle);
-		// search sessiones where username or firstname or lastname begins likes $needle
-		$sql = 'SELECT id, name FROM '.$tbl_session.' u
-				WHERE (name LIKE "'.$needle.'%")
-				ORDER BY name, id
-				LIMIT 11';
-		$rs = Database::query($sql, __FILE__, __LINE__);
-        $i=0;
-		while ($session = Database :: fetch_array($rs)) {
-			$i++;
-            if ($i<=10) {
-			     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
-            } else {
-            	$return .= '...<br />';
-            }
-		}
-	}
-	$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
-	return $xajax_response;
-}
 
 $xajax -> processRequests();
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');

main/admin/access_url_edit_users_to_url.php

@@ -69,42 +69,6 @@ if(isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!=''){
 	$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
 }
 
-function search_users($needle, $id)
-{
-	global $tbl_user, $tbl_access_url_rel_user;
-	$xajax_response = new XajaxResponse();
-	$return = '';
-
-	if(!empty($needle)) {
-		// xajax send utf8 datas... datas in db can be non-utf8 datas
-		$charset = api_get_setting('platform_charset');
-		$needle = api_convert_encoding($needle, $charset, 'utf-8');
-		$needle = Database::escape_string($needle);
-		// search users where username or firstname or lastname begins likes $needle
-		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-		$sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u
-				WHERE (username LIKE "'.$needle.'%"
-				OR firstname LIKE "'.$needle.'%"
-				OR lastname LIKE "'.$needle.'%")'.
-				$order_clause.
-				' LIMIT 11';
-
-		$rs = Database::query($sql, __FILE__, __LINE__);
-        $i=0;
-
-		while ($user = Database :: fetch_array($rs)) {
-			$i++;
-            if ($i<=10) {
-			    $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
-            } else {
-            	$return .= '...<br />';
-            }
-		}
-	}
-	$xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
-	return $xajax_response;
-}
-
 $xajax -> processRequests();
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
 $htmlHeadXtra[] = '

main/inc/lib/access_url_edit_courses_to_url_functions.lib.php

@@ -0,0 +1,53 @@
+<?php
+/* For licensing terms, see /chamilo_license.txt */
+/**
+ * Access_url_edit_courses_to_url class  
+ * Contains several functions dealing with displaying,
+ * editing,... of a Access_url_edit_courses_to_url_functions
+ *
+ * @version 1.0
+ * @author Toon Keppens <toon@vi-host.net>
+ * @author Julio Montoya - Cleaning code
+ * @author Ricardo Rodriguez - Separated the function and code
+ *
+ */
+
+require_once ('xajax/xajax.inc.php');
+
+class Accessurleditcoursestourl {
+
+	function search_courses($needle, $id)
+	{
+		global $tbl_course;
+		$xajax_response = new XajaxResponse();
+		$return = '';
+	
+		if(!empty($needle)) {
+			// xajax send utf8 datas... datas in db can be non-utf8 datas
+			$charset = api_get_setting('platform_charset');
+			$needle = api_convert_encoding($needle, $charset, 'utf-8');
+			$needle = Database::escape_string($needle);
+			// search courses where username or firstname or lastname begins likes $needle
+			$sql = 'SELECT code, title FROM '.$tbl_course.' u
+					WHERE (title LIKE "'.$needle.'%"
+					OR code LIKE "'.$needle.'%"
+					)
+					ORDER BY title, code
+					LIMIT 11';
+			$rs = Database::query($sql, __FILE__, __LINE__);
+	        $i=0;
+			while ($course = Database :: fetch_array($rs)) {
+				$i++;
+	            if ($i<=10) {
+				     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
+	            } else {
+	            	$return .= '...<br />';
+	            }
+			}
+		}
+		$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
+		return $xajax_response;
+	}
+
+}
+?>

main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php

@@ -0,0 +1,51 @@
+<?php
+/* For licensing terms, see /chamilo_license.txt */
+/**
+ * Access_url_edit_session_to_url class  
+ * Contains several functions dealing with displaying,
+ * editing,... of a Access_url_edit_session_to_url_functions
+ *
+ * @version 1.0
+ * @author Toon Keppens <toon@vi-host.net>
+ * @author Julio Montoya - Cleaning code
+ * @author Ricardo Rodriguez - Separated the function and code
+ *
+ */
+
+require_once ('xajax/xajax.inc.php');
+
+class Accessurleditsessionstourl {
+	
+	function search_sessions($needle, $id)
+	{
+		global $tbl_session;
+		$xajax_response = new XajaxResponse();
+		$return = '';
+	
+		if(!empty($needle)) {
+			// xajax send utf8 datas... datas in db can be non-utf8 datas
+			$charset = api_get_setting('platform_charset');
+			$needle = api_convert_encoding($needle, $charset, 'utf-8');
+			$needle = Database::escape_string($needle);
+			// search sessiones where username or firstname or lastname begins likes $needle
+			$sql = 'SELECT id, name FROM '.$tbl_session.' u
+					WHERE (name LIKE "'.$needle.'%")
+					ORDER BY name, id
+					LIMIT 11';
+			$rs = Database::query($sql, __FILE__, __LINE__);
+	        $i=0;
+			while ($session = Database :: fetch_array($rs)) {
+				$i++;
+	            if ($i<=10) {
+				     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
+	            } else {
+	            	$return .= '...<br />';
+	            }
+			}
+		}
+		$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
+		return $xajax_response;
+	}
+}
+
+?>

main/inc/lib/access_url_edit_users_to_url_functions.lib.php

@@ -0,0 +1,57 @@
+<?php
+/* For licensing terms, see /chamilo_license.txt */
+/**
+ * Access_url_edit_users_to_url class  
+ * Contains several functions dealing with displaying,
+ * editing,... of a Access_url_edit_users_to_url_functions
+ *
+ * @version 1.0
+ * @author Toon Keppens <toon@vi-host.net>
+ * @author Julio Montoya - Cleaning code
+ * @author Ricardo Rodriguez - Separated the function and code
+ *
+ */
+ 
+ 
+require_once ('xajax/xajax.inc.php');
+
+class Accessurledituserstourl{
+	
+	function search_users($needle, $id)
+	{
+		global $tbl_user, $tbl_access_url_rel_user;
+		$xajax_response = new XajaxResponse();
+		$return = '';
+	
+		if(!empty($needle)) {
+			// xajax send utf8 datas... datas in db can be non-utf8 datas
+			$charset = api_get_setting('platform_charset');
+			$needle = api_convert_encoding($needle, $charset, 'utf-8');
+			$needle = Database::escape_string($needle);
+			// search users where username or firstname or lastname begins likes $needle
+			$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+			$sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u
+					WHERE (username LIKE "'.$needle.'%"
+					OR firstname LIKE "'.$needle.'%"
+					OR lastname LIKE "'.$needle.'%")'.
+					$order_clause.
+					' LIMIT 11';
+	
+			$rs = Database::query($sql, __FILE__, __LINE__);
+	        $i=0;
+	
+			while ($user = Database :: fetch_array($rs)) {
+				$i++;
+	            if ($i<=10) {
+				    $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
+	            } else {
+	            	$return .= '...<br />';
+	            }
+			}
+		}
+		$xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
+		return $xajax_response;
+	}
+
+}
+?>

tests/main/inc/lib/access_url_edit_courses_to_url_functions.lib.test.php

@@ -0,0 +1,36 @@
+<?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 TestAccessUrlEditCoursesToUrl(){
+		$this->UnitTestCase('this File test the provides some function for Access Url Edit Courses To Url');
+		
+	}
+	
+	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);	
+	}
+	
+	
+
+}
+
+?>

tests/main/inc/lib/access_url_edit_sessions_to_url_functions.lib.test.php

@@ -0,0 +1,33 @@
+<?php
+
+require_once(api_get_path(LIBRARY_PATH).'access_url_edit_sessions_to_url_functions.lib.php');
+
+class TestAccessUrlEditSessionsToUrlFunctions extends UnitTestCase{
+
+	public function TestAccessUrlEditSessionsToUrlFunctions(){
+		$this->UnitTestCase('this File test the provides some function for Access Url Edit Sessions To Url');
+		
+	}
+	
+	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);
+		
+	}
+
+}
+?>

tests/main/inc/lib/access_url_edit_users_to_url_functions.lib.test.php

@@ -0,0 +1,34 @@
+<?php
+
+require_once(api_get_path(LIBRARY_PATH).'access_url_edit_users_to_url_functions.lib.php');
+
+class TestAccessUrlEditUsersToUrlFunctions extends UnitTestCase{
+
+	public function TestAccessUrlEditUsersToUrlFunctions(){
+		$this->UnitTestCase('this File test the provides some function for Access Url Edit Users To Url');
+		
+	}
+	
+	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);
+		
+	}
+
+}
+
+?>