Removing libs already called in global.inc.php + possible fixing of #3827

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 ' .

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'];
 

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'];

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();

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';
 

main/messages/new_message.php

@@ -326,16 +326,8 @@ echo '<div id="social-content">';
 	$id_content_right = '';
 	//LEFT COLUMN
 	if (api_get_setting('allow_social_tool') != 'true') {
-		$id_content_right = 'inbox';
-	/*	echo '<div id="inbox-menu" class="actions">';
-		echo '<ul>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>'.'</li>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';			
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
-		echo '</ul>';
-		echo '</div>';*/
-	} else {
-		require_once api_get_path(LIBRARY_PATH).'social.lib.php';
+		$id_content_right = 'inbox';		
+	} else {		
 		echo '<div id="social-content-left">';
 		//this include the social menu div
 		SocialManager::show_social_menu('messages');

main/messages/outbox.php

@@ -128,17 +128,8 @@ echo '<div id="social-content">';
 	$id_content_right = '';
 	//LEFT COLUMN	
 	if (api_get_setting('allow_social_tool') != 'true') { 
-		$id_content_right = 'outbox';
-		/*
-		echo '<div id="inbox-menu" class="actions">';
-		echo '<ul>';
-		echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>'.'</li>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';			
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
-		echo '</ul>';
-		echo '</div>';*/		
-	} else {
-		require_once api_get_path(LIBRARY_PATH).'social.lib.php';
+		$id_content_right = 'outbox';				
+	} else {		
 		$id_content_right = 'social-content-right';
 		echo '<div id="social-content-left">';	
 			//this include the social menu div

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 )  {
 <?php
 }
 //here we decode to utf8 because this page is called from an ajax popup
-$subject_message = api_utf8_decode($subject_message);
-$content_message = api_utf8_decode($content_message);
 
 if ($panel_id==4 && !empty($content_message)) {
 	if ($subject_message=='clear') {
 		$subject_message=null;
 	}	
-	SocialManager::send_invitation_friend_user($user_id,$subject_message,$content_message);
+	SocialManager::send_invitation_friend_user($user_id, $subject_message, $content_message);
 } elseif ($panel_id==5 && !empty($subject_message) ) {
-	SocialManager::send_invitation_friend_user($user_id,$subject_message,$content_message);
-}
-?>
+	SocialManager::send_invitation_friend_user($user_id, $subject_message, $content_message);
+}

main/messages/send_message_to_userfriend.inc.php

@@ -57,4 +57,4 @@ if (api_get_setting('allow_message_tool')=='true') {
 <?php			}
 			} ?>
     </dl>
-</div>
+</div>

main/messages/view_message.php

@@ -64,8 +64,7 @@ echo '<div id="social-content">';
 	//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 '<div id="social-content-left">';	
 			//this include the social menu div			

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)) {

main/webservices/cm_webservice_user.php

@@ -1,9 +1,6 @@
 <?php
 
 require_once(dirname(__FILE__).'/../inc/global.inc.php');
-$libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'usermanager.lib.php';
-require_once $libpath.'social.lib.php';
 require_once(dirname(__FILE__).'/cm_webservice.php');
 
 /**

user_portal.php

@@ -616,9 +616,6 @@ $profile_content .= ' </div></div>';
 
 //  @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.