(no commit message)

main/auth/profile.php

@@ -389,11 +389,12 @@ foreach ($extra as $id => $field_details) {
            					'.$tag_list.'
       						 </select>';			
 			$form->addElement('html',$pre_html.$multi_select.$post );
-			$url = api_get_path(WEB_CODE_PATH).'user';
+			$url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php';
+			
 			//if cache is set to true the jquery will be called 1 time
 			$jquery_ready_content.= <<<EOF
       		$("#extra_$field_details[1]").fcbkcomplete({
-	            json_url: "$url/$field_details[1].php?field_id=$field_details[0]",
+	            json_url: "$url?a=search_tags&field_id=$field_details[0]",
 	            cache: false,
 	            filter_case: true,
 	            filter_hide: true,

main/inc/ajax/course_home.ajax.php

@@ -78,10 +78,10 @@ switch ($action) {
 		      		'view'    => $requested_view
 				);
 				print(json_encode($response_data));
-				exit;
 			}
 	break;
 	default:
 		echo '';
 }
+exit;
 ?>

main/inc/ajax/message.ajax.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * This class response to the Ajax calls
+ * 
+ */
+require_once '../global.inc.php';
+$action = $_GET['a'];
+
+switch ($action) {	
+	case 'find_users':
+	
+		$track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+		$tbl_my_user		= Database :: get_main_table(TABLE_MAIN_USER);
+		$tbl_my_user_friend = Database :: get_main_table(TABLE_MAIN_USER_FRIEND);
+		$tbl_user 			= Database :: get_main_table(TABLE_MAIN_USER);
+		$search				= Database::escape_string(Security::remove_XSS($_POST['search']));
+		$current_date		= date('Y-m-d H:i:s',time());
+		
+		api_block_anonymous_users();
+		
+		$user_id = api_get_user_id();
+		$is_western_name_order = api_is_western_name_order();
+		
+		if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
+			
+			//all users 
+			if (api_get_setting('display_all_platform_users_in_message_tool') == 'true') {
+				$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
+				FROM '.$tbl_user.' u  	
+		 		WHERE u.user_id <>'.(int)$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") LIMIT 15';		
+			} else {
+				//only my contacts
+				$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
+				FROM '.$tbl_my_user_friend.' uf ' .
+		 		'INNER JOIN '.$tbl_my_user.' AS u  ON uf.friend_user_id = u.user_id ' .
+		 		'WHERE relation_type<>6 AND friend_user_id<>'.(int)$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
+			}
+		 	
+		} elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
+			$valid=api_get_setting('time_limit_whosonline');
+			
+			$sql='SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
+			 FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id
+			 WHERE DATE_ADD(login_date,INTERVAL "'.$valid.'" MINUTE) >= "'.$current_date.'" AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
+		}
+		
+		$result=Database::query($sql,__FILE__,__LINE__);
+		
+		if (Database::num_rows($result)>0) {
+				while ($row = Database::fetch_array($result,'ASSOC')) {
+				$return[] = array('caption'=>$row['name'], 'value'=>$row['id']);
+			}
+		}
+		$return =  json_encode($return);
+		echo $return;		
+		break;
+	
+	
+	
+	default:
+		echo '';
+}
+exit;
+?>

main/inc/ajax/user_manager.ajax.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * This class response to the Ajax calls
+ * 
+ */
+require_once '../global.inc.php';
+$action = $_GET['a'];
+require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
+
+switch ($action) {	
+	case 'search_tags':
+			
+		/* For licensing terms, see /dokeos_license.txt */		
+		$field_id = intval($_GET['field_id']);
+		$tag = $_GET['tag'];
+		echo UserManager::get_tags($tag, $field_id,'json','10');			
+		break;
+	default:
+		echo '';
+}
+exit;
+?>

main/inc/lib/main_api.lib.php

@@ -221,6 +221,8 @@ define('INCLUDE_PATH', 'INCLUDE_PATH');
 define('LIBRARY_PATH', 'LIBRARY_PATH');
 define('CONFIGURATION_PATH', 'CONFIGURATION_PATH');
 define('WEB_LIBRARY_PATH', 'WEB_LIBRARY_PATH');
+define('WEB_AJAX_PATH', 'WEB_AJAX_PATH');
+
 // Constants for requesting path conversion.
 define('TO_WEB', 'TO_WEB');
 define('TO_SYS', 'TO_SYS');

main/messages/find_users.php

@@ -1,55 +0,0 @@
-<?php
-/* For licensing terms, see /chamilo_license.txt */
-/**
- * @package dokeos.social
- * @author Julio Montoya <gugli100@gmail.com>
- */
- 
-$language_file = array('registration','messages','userInfo','admin');
-$cidReset = true;
-require '../inc/global.inc.php';
-$track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-$tbl_my_user		= Database :: get_main_table(TABLE_MAIN_USER);
-$tbl_my_user_friend = Database :: get_main_table(TABLE_MAIN_USER_FRIEND);
-$tbl_user 			= Database :: get_main_table(TABLE_MAIN_USER);
-$search				= Database::escape_string(Security::remove_XSS($_POST['search']));
-$current_date		= date('Y-m-d H:i:s',time());
-
-api_block_anonymous_users();
-
-$user_id = api_get_user_id();
-$is_western_name_order = api_is_western_name_order();
-
-if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
-	
-	//all users 
-	if (api_get_setting('display_all_platform_users_in_message_tool') == 'true') {
-		$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
-		FROM '.$tbl_user.' u  	
- 		WHERE u.user_id <>'.(int)$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") LIMIT 15';		
-	} else {
-		//only my contacts
-		$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
-		FROM '.$tbl_my_user_friend.' uf ' .
- 		'INNER JOIN '.$tbl_my_user.' AS u  ON uf.friend_user_id = u.user_id ' .
- 		'WHERE relation_type<>6 AND friend_user_id<>'.(int)$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
-	}
- 	
-} elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
-	$valid=api_get_setting('time_limit_whosonline');
-	
-	$sql='SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
-	 FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id
-	 WHERE DATE_ADD(login_date,INTERVAL "'.$valid.'" MINUTE) >= "'.$current_date.'" AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
-}
-
-$result=Database::query($sql,__FILE__,__LINE__);
-
-if (Database::num_rows($result)>0) {
-		while ($row = Database::fetch_array($result,'ASSOC')) {
-		$return[] = array('caption'=>$row['name'], 'value'=>$row['id']);
-	}
-}
-$return =  json_encode($return);
-echo $return;
-?>

main/messages/new_message.php

@@ -57,7 +57,7 @@ $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready(function (){		
 		
       		$("#users").fcbkcomplete({
-	            json_url: "find_users.php?",
+	            json_url: "'.api_get_path(WEB_AJAX_PATH).'message.ajax.php?a=find_users",
 	            cache: false,
 	            filter_case: true,
 	            filter_hide: true,

main/user/tags.php

@@ -1,7 +0,0 @@
-<?php
-/* For licensing terms, see /dokeos_license.txt */
-require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-$field_id = intval($_GET['field_id']);
-$tag = $_GET['tag'];
-echo UserManager::get_tags($tag, $field_id,'json','10');