From 0cc67fdfb17e4ccbf7f2f675b424001c1d544f5f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 24 Aug 2011 12:49:05 +0200 Subject: [PATCH] Removing libs already called in global.inc.php + possible fixing of #3827 --- main/inc/ajax/message.ajax.php | 3 +-- main/inc/ajax/social.ajax.php | 1 - main/inc/lib/message.lib.php | 4 ++-- main/inc/lib/social.lib.php | 2 +- main/messages/download.php | 1 - main/messages/new_message.php | 12 ++---------- main/messages/outbox.php | 13 ++----------- main/messages/send_message.php | 13 +++++-------- main/messages/send_message_to_userfriend.inc.php | 2 +- main/messages/view_message.php | 3 +-- main/social/group_invitation.php | 2 -- main/webservices/cm_webservice_user.php | 3 --- user_portal.php | 3 --- 13 files changed, 15 insertions(+), 47 deletions(-) diff --git a/main/inc/ajax/message.ajax.php b/main/inc/ajax/message.ajax.php index 7b45ab991c..2b87c114c4 100755 --- a/main/inc/ajax/message.ajax.php +++ b/main/inc/ajax/message.ajax.php @@ -29,8 +29,7 @@ switch ($action) { $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.status <> 6 AND u.user_id <>'.$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' LIKE CONCAT("%","'.$search.'","%") '; - } else { - require_once api_get_path(LIBRARY_PATH).'social.lib.php'; + } 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 ' . diff --git a/main/inc/ajax/social.ajax.php b/main/inc/ajax/social.ajax.php index 2b4642bc79..b2ce8ab4fa 100755 --- a/main/inc/ajax/social.ajax.php +++ b/main/inc/ajax/social.ajax.php @@ -4,7 +4,6 @@ * Responses to AJAX calls */ require_once '../global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'social.lib.php'; $action = $_GET['a']; diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 234611f5ff..d3b7b119fb 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -271,7 +271,7 @@ class MessageManager if (empty($group_id)) { //message in outbox for user friend or group $sql = "INSERT INTO $table_message (user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ". - " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content', '$group_id', '$parent_id', '".api_get_utc_datetime()."')"; + " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content', '$group_id', '$parent_id', '".api_get_utc_datetime()."')"; $rs = Database::query($sql); $outbox_last_id = Database::insert_id(); @@ -294,7 +294,7 @@ class MessageManager $notification->save_notification(NOTIFICATION_TYPE_MESSAGE, array($receiver_user_id), $subject, $content, $sender_info); } else { $group_info = GroupPortalManager::get_group_data($group_id); - $user_list = GroupPortalManager::get_users_by_group($group_id, false, array(),0, 1000); + $user_list = GroupPortalManager::get_users_by_group($group_id, false, array(),0, 1000); $new_user_list = array(); foreach($user_list as $user_data) { $new_user_list[]= $user_data['user_id']; diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 43d2f6fddc..f3613ba078 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -306,7 +306,7 @@ class SocialManager extends UserManager { * @param void * @return string message invitation */ - public static function send_invitation_friend_user ($userfriend_id, $subject_message='', $content_message='') { + public static function send_invitation_friend_user ($userfriend_id, $subject_message = '', $content_message = '') { global $charset; //$id_user_friend=array(); $user_info = array(); diff --git a/main/messages/download.php b/main/messages/download.php index 1dafe22ee8..276d4f90cb 100755 --- a/main/messages/download.php +++ b/main/messages/download.php @@ -15,7 +15,6 @@ session_cache_limiter('public'); require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php'; require_once api_get_path(LIBRARY_PATH).'document.lib.php'; diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 5ba1d6f987..a8054045c6 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -326,16 +326,8 @@ echo '
'; $id_content_right = ''; //LEFT COLUMN if (api_get_setting('allow_social_tool') != 'true') { - $id_content_right = 'inbox'; - /* echo '';*/ - } else { - require_once api_get_path(LIBRARY_PATH).'social.lib.php'; + $id_content_right = 'inbox'; + } else { echo '
'; //this include the social menu div SocialManager::show_social_menu('messages'); diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 5bc7d1706f..027cae888b 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -128,17 +128,8 @@ echo '
'; $id_content_right = ''; //LEFT COLUMN if (api_get_setting('allow_social_tool') != 'true') { - $id_content_right = 'outbox'; - /* - echo '';*/ - } else { - require_once api_get_path(LIBRARY_PATH).'social.lib.php'; + $id_content_right = 'outbox'; + } else { $id_content_right = 'social-content-right'; echo '
'; //this include the social menu div diff --git a/main/messages/send_message.php b/main/messages/send_message.php index 21dad840b8..9538108de7 100755 --- a/main/messages/send_message.php +++ b/main/messages/send_message.php @@ -17,8 +17,8 @@ if (api_is_anonymous()) { $user_id = intval($_POST['user_id']); $panel_id = intval($_POST['panel_id']); -$content_message = ($_POST['txt_content']); //check this is filtered on output -$subject_message = ($_POST['txt_subject']); //check this is filtered on output +$content_message = $_POST['txt_content']; //check this is filtered on output +$subject_message = $_POST['txt_subject']; //check this is filtered on output $user_info = array(); @@ -66,15 +66,12 @@ if ($panel_id == 2 || $panel_id == 4 ) { + SocialManager::send_invitation_friend_user($user_id, $subject_message, $content_message); +} \ No newline at end of file diff --git a/main/messages/send_message_to_userfriend.inc.php b/main/messages/send_message_to_userfriend.inc.php index 4096634b65..eb208c45d0 100755 --- a/main/messages/send_message_to_userfriend.inc.php +++ b/main/messages/send_message_to_userfriend.inc.php @@ -57,4 +57,4 @@ if (api_get_setting('allow_message_tool')=='true') { -
+
\ No newline at end of file diff --git a/main/messages/view_message.php b/main/messages/view_message.php index ab45466e1b..a75f52ed34 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -64,8 +64,7 @@ echo '
'; //LEFT COLUMN if (api_get_setting('allow_social_tool') != 'true') { $id_content_right = 'inbox'; - } else { - require_once api_get_path(LIBRARY_PATH).'social.lib.php'; + } else { $id_content_right = 'social-content-right'; echo '
'; //this include the social menu div diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php index d9ca0c538d..c734b75a38 100755 --- a/main/social/group_invitation.php +++ b/main/social/group_invitation.php @@ -47,9 +47,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){ } //checking for extra field with filter on -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php'; -require_once api_get_path(LIBRARY_PATH).'social.lib.php'; //todo @this validation could be in a function in group_portal_manager if (empty($group_id)) { diff --git a/main/webservices/cm_webservice_user.php b/main/webservices/cm_webservice_user.php index 542b33cdc2..ac41c82053 100644 --- a/main/webservices/cm_webservice_user.php +++ b/main/webservices/cm_webservice_user.php @@ -1,9 +1,6 @@
'; // @todo Add a platform setting to add the user image. if (api_get_setting('allow_message_tool') == 'true') { - - require_once api_get_path(LIBRARY_PATH).'message.lib.php'; - require_once api_get_path(LIBRARY_PATH).'social.lib.php'; require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php'; // New messages.