Moving require_once to global.inc.php

main/cron/notification.php

@@ -10,7 +10,6 @@
 $language_file = array('userInfo');
 
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'notification.lib.php';
 /**
  * Notification sending
  */

main/inc/global.inc.php

@@ -101,12 +101,13 @@ require_once $lib_path.'security.lib.php';
 require_once $lib_path.'events.lib.inc.php';
 require_once $lib_path.'debug.lib.php';
 
+
+require_once $lib_path.'model.lib.php';
 require_once $lib_path.'sortabletable.class.php';
 require_once $lib_path.'usermanager.lib.php';
 require_once $lib_path.'message.lib.php';
 require_once $lib_path.'social.lib.php';
-
-
+require_once $lib_path.'notification.lib.php';
 
 
 /*  DATABASE CONNECTION  */

main/inc/lib/message.lib.php

@@ -287,8 +287,7 @@ class MessageManager
 				}
 			}
 			
-			//Load user settings
-			require_once api_get_path(LIBRARY_PATH).'notification.lib.php';
+			//Load user settings			
 			$notification = new Notification();			    
 		    if (empty($group_id)) {                
 		        $sender_info = api_get_user_info($user_sender_id);

main/inc/lib/notification.lib.php

@@ -8,8 +8,6 @@
 /**
  * Code
  */
-require_once 'model.lib.php';
-require_once 'usermanager.lib.php';
 
 //@todo put constants in an array
 

main/inc/lib/social.lib.php

@@ -191,7 +191,6 @@ class SocialManager extends UserManager {
 			$sql='INSERT INTO '.$tbl_message.'(user_sender_id,user_receiver_id,msg_status,send_date,title,content) VALUES('.$user_id.','.$friend_id.','.MESSAGE_STATUS_INVITATION_PENDING.',"'.$current_date.'","'.$message_title.'","'.$message_content.'")';
 			Database::query($sql);	
 			
-			require_once api_get_path(LIBRARY_PATH).'notification.lib.php';
 			$sender_info = api_get_user_info($user_id);
 			$notification = new Notification(); 
 		    $notification->save_notification(NOTIFICATION_TYPE_INVITATION, array($friend_id), $message_title, $message_content, $sender_info);    		

main/inc/lib/usermanager.lib.php

@@ -292,8 +292,7 @@ class UserManager {
                     GroupPortalManager::delete_user_rel_group($user_id, $group_id);
 			    }
 			}
-			
-			require_once api_get_path(LIBRARY_PATH).'social.lib.php';
+						
 			//Delete user from friend lists
 			SocialManager::remove_user_rel_user($user_id, true);
 		}

main/messages/inbox.php

@@ -10,7 +10,6 @@
 $language_file = array('registration','messages','userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'message.lib.php';
 
 api_block_anonymous_users();
 if (isset($_GET['messages_page_nr'])) {
@@ -150,8 +149,7 @@ echo '<div id="social-content">';
 	//LEFT CONTENT			
 	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/messages/new_message.php

@@ -26,7 +26,6 @@ if (api_get_setting('allow_message_tool') !='true' ){
 
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'message.lib.php';
 
 $nameTools = api_xml_http_response_encode(get_lang('Messages'));
 /*	Constants and variables */

main/messages/outbox.php

@@ -10,7 +10,6 @@
 $language_file = array('registration','messages','userInfo');
 $cidReset=true;
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'message.lib.php';
 
 api_block_anonymous_users();
 

main/messages/send_message.php

@@ -9,9 +9,6 @@
 $language_file = array('registration','messages','userInfo','admin');
 $cidReset=true;
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'message.lib.php';
-require_once api_get_path(LIBRARY_PATH).'social.lib.php';
 
 if (api_is_anonymous()) {
 	api_not_allowed();

main/messages/send_message_to_userfriend.inc.php

@@ -9,9 +9,6 @@
 $language_file = array('registration','messages','userInfo','admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'message.lib.php';
-require_once api_get_path(LIBRARY_PATH).'social.lib.php';
 
 if (api_is_anonymous()) {
 	api_not_allowed();

main/messages/view_message.php

@@ -13,7 +13,6 @@ api_block_anonymous_users();
 if (api_get_setting('allow_message_tool')!='true') {
 	api_not_allowed();
 }
-require_once api_get_path(LIBRARY_PATH).'message.lib.php';
 
 /*		HEADER  */