From 7b434571d311ace6b483ba052a0c818c51523e4c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 14 Dec 2009 09:52:29 -0500 Subject: [PATCH] (no commit message) --- main/auth/profile.php | 5 ++- main/inc/ajax/course_home.ajax.php | 2 +- main/inc/ajax/message.ajax.php | 64 +++++++++++++++++++++++++++++ main/inc/ajax/user_manager.ajax.php | 22 ++++++++++ main/inc/lib/main_api.lib.php | 2 + main/messages/find_users.php | 55 ------------------------- main/messages/new_message.php | 2 +- main/user/tags.php | 7 ---- 8 files changed, 93 insertions(+), 66 deletions(-) create mode 100644 main/inc/ajax/message.ajax.php create mode 100644 main/inc/ajax/user_manager.ajax.php delete mode 100755 main/messages/find_users.php delete mode 100755 main/user/tags.php diff --git a/main/auth/profile.php b/main/auth/profile.php index d8fafc02d6..2541ff8d3d 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -389,11 +389,12 @@ foreach ($extra as $id => $field_details) { '.$tag_list.' '; $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.= << $requested_view ); print(json_encode($response_data)); - exit; } break; default: echo ''; } +exit; ?> \ No newline at end of file diff --git a/main/inc/ajax/message.ajax.php b/main/inc/ajax/message.ajax.php new file mode 100644 index 0000000000..41edf7ad80 --- /dev/null +++ b/main/inc/ajax/message.ajax.php @@ -0,0 +1,64 @@ +'.(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; +?> \ No newline at end of file diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php new file mode 100644 index 0000000000..528a44b58e --- /dev/null +++ b/main/inc/ajax/user_manager.ajax.php @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index a025c2730c..48e4afa982 100755 --- a/main/inc/lib/main_api.lib.php +++ b/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'); diff --git a/main/messages/find_users.php b/main/messages/find_users.php deleted file mode 100755 index 24ea9feea1..0000000000 --- a/main/messages/find_users.php +++ /dev/null @@ -1,55 +0,0 @@ - - */ - -$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; -?> \ No newline at end of file diff --git a/main/messages/new_message.php b/main/messages/new_message.php index a52c5b0230..919920a370 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -57,7 +57,7 @@ $htmlHeadXtra[] = '