Browse Source

Removing require_once calls

Julio Montoya 12 years ago
parent
commit
627c7bb720

+ 0 - 1
main/newscorm/aicc.class.php

@@ -790,7 +790,6 @@ class aicc extends learnpath
         // Zip everything that is in the corresponding scorm dir.
         // Write the zip file somewhere (might be too big to return).
 
-        require_once api_get_path(LIBRARY_PATH).'document.lib.php';
         require_once 'learnpath_functions.inc.php';
         $course_id = api_get_course_int_id();
         $tbl_lp = Database::get_course_table(TABLE_LP_MAIN);

+ 1 - 3
main/search/index.php

@@ -12,9 +12,7 @@ $language_file = array('admin');
 require_once '../inc/global.inc.php';
 $this_section =  SECTION_COURSES;
 
-if (extension_loaded('xapian')) {	
-	require_once api_get_path(LIBRARY_PATH).'system_announcements.lib.php';
-	require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';	
+if (extension_loaded('xapian')) {
 	//api_block_anonymous_users(); // only users who are logged in can proceed
 	require '../newscorm/lp_list_search.php';
 } else {

+ 0 - 2
main/social/group_add.php

@@ -16,8 +16,6 @@ if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
 
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 if (api_get_setting('allow_students_to_create_groups_in_social') == 'false' && !api_is_allowed_to_edit()) {
 	api_not_allowed();
 }

+ 0 - 3
main/social/group_invitation.php

@@ -46,9 +46,6 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
-//checking for extra field with filter on
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 //todo @this validation could be in a function in group_portal_manager
 if (empty($group_id)) {
 	api_not_allowed();

+ 0 - 2
main/social/group_members.php

@@ -16,8 +16,6 @@ if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
 
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 $interbreadcrumb[] = array('url' => 'groups.php','name' => get_lang('Groups'));

+ 0 - 2
main/social/group_topics.php

@@ -14,8 +14,6 @@ if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
 
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 $group_id	= intval($_GET['id']);
 $topic_id   = intval($_GET['topic_id']);
 $message_id = intval($_GET['msg_id']);

+ 0 - 2
main/social/group_waiting_list.php

@@ -16,8 +16,6 @@ if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
 
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));

+ 0 - 1
main/social/home.php

@@ -11,7 +11,6 @@ $language_file = array('userInfo');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
 
 $user_id = api_get_user_id();

+ 0 - 2
main/social/myfiles.php

@@ -17,8 +17,6 @@ if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
 
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 $this_section = SECTION_SOCIAL;
 $_SESSION['this_section']=$this_section;
 

+ 0 - 2
main/social/profile_friends_and_groups.inc.php

@@ -17,8 +17,6 @@ if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
 
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
 $views = array('friends','mygroups');
 $user_id = intval($_GET['user_id']);
 

+ 0 - 1
main/social/search.php

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

+ 0 - 1
main/survey/fillsurvey.php

@@ -27,7 +27,6 @@ if (!isset($_GET['cidReq'])) {
 require_once '../inc/global.inc.php';
 
 // Including additional libraries
-//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
 require_once 'survey.lib.php';
 
 // Breadcrumbs

+ 0 - 1
main/upload/upload.document.php

@@ -21,7 +21,6 @@ if (!function_exists('api_get_path')) {
     header('location: upload.php');
     die;
 }
-require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 require_once '../document/document.inc.php';
 
 $courseDir = $_course['path']."/document";

+ 1 - 3
main/upload/upload_ppt.php

@@ -16,12 +16,10 @@ $language_file[] = "learnpath";
 $language_file[] = "scormdocument";
 
 // global settings initialisation
-// also provides access to main api (inc/lib/main_api.lib.php)
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 
 $htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
-$htmlHeadXtra[] = '<script type="text/javascript">
+$htmlHeadXtra[] = '<script>
 	var myUpload = new upload(0);
 </script>';
 

+ 1 - 3
main/user/classes.php

@@ -12,8 +12,6 @@ $language_file = array('userInfo','admin');
 $cidReset=true;
 require_once '../inc/global.inc.php';
 
-require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
-
 api_block_anonymous_users();
 
 $this_section = SECTION_COURSES;
@@ -24,7 +22,7 @@ if (isset($_GET['id'])) {
 }
 
 if (api_get_setting('show_groups_to_users') == 'false') {
-    
+
 }
 
 

+ 0 - 3
main/user/user.php

@@ -32,9 +32,6 @@ $this_section = SECTION_COURSES;
 // notice for unauthorized people.
 api_protect_course_script(true);
 
-/*		Libraries	*/
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-
 global $_configuration;
 
 if (!api_is_platform_admin(true)) {

+ 20 - 21
main/user/user_import.php

@@ -4,7 +4,6 @@
 $language_file = array('registration', 'admin', 'userInfo');
 
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 
 $this_section = SECTION_COURSES;
 
@@ -45,31 +44,31 @@ $type = '';
 
 if ($form->validate()) {
     if (isset($_FILES['import_file']['size']) && $_FILES['import_file']['size'] !== 0) {
-        
+
         $unsubscribe_users = isset($_POST['unsubscribe_users']) ? true : false;
-                
+
         $users  = Import::csv_to_array($_FILES['import_file']['tmp_name']);
-        
+
         $invalid_users  = array();
         $clean_users    = array();
-                
-        if (!empty($users)) { 
-            
+
+        if (!empty($users)) {
+
             foreach ($users as $user_data) {
                 $username = $user_data['username'];
-                $user_id = UserManager::get_user_id_from_username($username);                
+                $user_id = UserManager::get_user_id_from_username($username);
                 $user_info = api_get_user_info($user_id);
                 if ($user_id && !empty($user_info)) {
-                    $clean_users[$user_id] = $user_info;                    
+                    $clean_users[$user_id] = $user_info;
                 } else {
                     $invalid_users[] = $user_id;
                 }
             }
-            
+
             if (empty($invalid_users)) {
                 $type = 'confirmation';
                 $message = get_lang('ListOfUsersSubscribedToCourse');
-                
+
                 if ($unsubscribe_users) {
                     $current_user_list = CourseManager::get_user_list_from_course_code($course_code, $session_id);
                     if (!empty($current_user_list)) {
@@ -78,9 +77,9 @@ if ($form->validate()) {
                             $user_ids[]= $user['user_id'];
                         }
                         CourseManager::unsubscribe_user($user_ids, $course_code, $session_id);
-                    }                    
-                }                
-                foreach ($clean_users as $user_info) {      
+                    }
+                }
+                foreach ($clean_users as $user_info) {
                     $user_id = $user_info['user_id'];
                     CourseManager :: subscribe_user($user_id, $course_code, STUDENT, $session_id);
                     if (empty($session_id)) {
@@ -94,14 +93,14 @@ if ($form->validate()) {
                             $user_to_show[]= $user_info['complete_name'];
                         }
                     }
-                }   
+                }
             } else {
                 $message = get_lang('CheckUsersWithId');
-                $type = 'warning';                
-                foreach ($invalid_users as $invalid_user) {                    
+                $type = 'warning';
+                foreach ($invalid_users as $invalid_user) {
                     $user_to_show[]= $invalid_user;
-                }        
-            }            
+                }
+            }
         }
     }
 }
@@ -119,7 +118,7 @@ if (!empty($message)) {
         Display::display_error_message(get_lang('ErrorsWhenImportingFile'));
     }
 }
-    
+
 $form->display();
 
 echo get_lang('CSVMustLookLike');
@@ -127,7 +126,7 @@ echo '<blockquote><pre>
     username;
     jdoe;
     jmontoya;
-</pre>  
+</pre>
 </blockquote>';
 
 Display::display_footer();

+ 0 - 4
main/webservices/registration.soap.php

@@ -327,7 +327,6 @@ function WSCreateUsers($params)
         if ($result) {
             //echo "id returned";
             $return = Database::insert_id();
-            require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
             if ($_configuration['multiple_access_urls']) {
                 if (api_get_current_access_url_id() != -1) {
                     UrlManager::add_user_to_url($return, api_get_current_access_url_id());
@@ -539,7 +538,6 @@ function WSCreateUser($params)
     if ($result) {
         //echo "id returned";
         $return = Database::insert_id();
-        require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
         if ($_configuration['multiple_access_urls']) {
             if (api_get_current_access_url_id() != -1) {
                 UrlManager::add_user_to_url($return, api_get_current_access_url_id());
@@ -845,7 +843,6 @@ function WSCreateUsersPasswordCrypted($params)
         if ($result) {
             //echo "id returned";
             $return = Database::insert_id();
-            require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
             if ($_configuration['multiple_access_urls']) {
                 if (api_get_current_access_url_id() != -1) {
                     UrlManager::add_user_to_url($return, api_get_current_access_url_id());
@@ -1145,7 +1142,6 @@ function WSCreateUserPasswordCrypted($params)
         $return = Database::insert_id();
 
         //Multiple URL
-        require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
         $url_id = api_get_current_access_url_id();
         UrlManager::add_user_to_url($return, $url_id);
         if ($debug) {

+ 0 - 1
main/webservices/user_import/service.php

@@ -32,7 +32,6 @@ function import_users_from_file($filepath, $security_key)
     }
 
     // Libraries
-    require_once api_get_path(LIBRARY_PATH).'import.lib.php';
     require_once 'import.lib.php';
 
     // Check is users file exists.

+ 0 - 7
main/wiki/wiki.inc.php

@@ -1980,12 +1980,6 @@ function export2doc($doc_id)
 function export_to_pdf($id, $course_code)
 {
     $data = get_wiki_data($id);
-
-    require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
-
-    $data = get_wiki_data($id);
-
-
     $content_pdf = api_html_entity_decode($data['content'], ENT_QUOTES, api_get_system_encoding());
 
     //clean wiki links
@@ -2018,7 +2012,6 @@ function export_to_pdf($id, $course_code)
     } else {
         $css = '';
     }
-    require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
     $pdf = new PDF();
     $pdf->content_to_pdf($html, $css, $title_pdf, $course_code);
     exit;

+ 0 - 3
main/work/downloadfolder.inc.php

@@ -31,9 +31,6 @@ if (empty($_course) || empty($_course['path'])) {
 }
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
 
-//zip library for creation of the zipfile
-require_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php';
-
 //Creating a ZIP file
 $temp_zip_file = api_get_path(SYS_ARCHIVE_PATH).api_get_unique_id().".zip";
 

+ 1 - 2
plugin/bbb/lib/bbb.lib.php

@@ -435,11 +435,10 @@ class bbb {
         if (empty($id) or empty($record_id)) {
             return false;
         }
-        require_once api_get_path(LIBRARY_PATH).'link.lib.php';
         $records =  BigBlueButtonBN::getRecordingsArray($id, $this->url, $this->salt);
         if (!empty($records)) {
             foreach ($records as $record) {
-error_log($record['recordID']);
+                //error_log($record['recordID']);
                 if ($record['recordID'] == $record_id) {
                     if (is_array($record) && isset($record['recordID']) && isset($record['playbacks'])) {
                         foreach ($record['playbacks'] as $item) {

+ 0 - 1
plugin/dashboard/block_course/block_course.class.php

@@ -9,7 +9,6 @@
 /**
  * required files for getting data
  */
-require_once api_get_path(LIBRARY_PATH).'thematic.lib.php';
 
 /**
  * This class is used like controller for this course block plugin,

+ 0 - 2
plugin/dashboard/block_daily/block_daily.class.php

@@ -12,8 +12,6 @@
  * required files for getting data
  */
 
-require_once api_get_path(LIBRARY_PATH).'thematic.lib.php';
-require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
 
 /**

+ 13 - 14
plugin/dashboard/block_session/block_session.class.php

@@ -9,7 +9,6 @@
 /**
  * required files for getting data
  */
-require_once api_get_path(LIBRARY_PATH).'course_description.lib.php';
 
 /**
  * This class is used like controller for this session block plugin,
@@ -33,7 +32,7 @@ class BlockSession extends Block {
     		/*if (api_is_platform_admin()) {
 	    		$this->sessions = SessionManager::get_sessions_list();
 	    	} else {*/
-	    		$this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);	
+	    		$this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
 	    	//}
     	}
     }
@@ -42,15 +41,15 @@ class BlockSession extends Block {
 	 * This method check if a user is allowed to see the block inside dashboard interface
 	 * @param	int		User id
 	 * @return	bool	Is block visible for user
-	 */    
-    public function is_block_visible_for_user($user_id) {	
+	 */
+    public function is_block_visible_for_user($user_id) {
     	$user_info = api_get_user_info($user_id);
 		$user_status = $user_info['status'];
 		$is_block_visible_for_user = false;
     	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
     		$is_block_visible_for_user = true;
-    	}    	
-    	return $is_block_visible_for_user;    	
+    	}
+    	return $is_block_visible_for_user;
     }
 
     /**
@@ -96,13 +95,13 @@ class BlockSession extends Block {
 
 		$content = '<div style="margin:10px;">';
 		$content .= '<h3><font color="#000">'.get_lang('YourSessionsList').'</font></h3>';
-		
-		if (count($sessions) > 0) {			
+
+		if (count($sessions) > 0) {
 			$sessions_table = '<table class="data_table" width:"95%">';
- 			$sessions_table .= '<tr>								
+ 			$sessions_table .= '<tr>
 									<th >'.get_lang('Title').'</th>
 									<th >'.get_lang('Date').'</th>
-									<th width="100px">'.get_lang('NbCoursesPerSession').'</th>							
+									<th width="100px">'.get_lang('NbCoursesPerSession').'</th>
 								</tr>';
 			$i = 1;
 			foreach ($sessions as $session) {
@@ -110,21 +109,21 @@ class BlockSession extends Block {
 				$session_id = intval($session['id']);
 				$title = $session['name'];
                 $date_string = SessionManager::parse_session_dates($session);
-	 			
+
 	 			$count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
-	 			
+
 				if ($i%2 == 0) $class_tr = 'row_odd';
 	    		else $class_tr = 'row_even';
 
 				$sessions_table .= '<tr class="'.$class_tr.'">
 										<td>'.$title.'</td>
 										<td align="center">'.$date_string.'</td>
-										<td align="center">'.$count_courses_in_session.'</td>										
+										<td align="center">'.$count_courses_in_session.'</td>
 								   </tr>';
 				$i++;
 			}
 			$sessions_table .= '</table>';
-			$content .= $sessions_table; 
+			$content .= $sessions_table;
 		} else {
 			$content .= get_lang('ThereIsNoInformationAboutYourSessions');
 		}

+ 0 - 1
plugin/dashboard/block_student/block_student.class.php

@@ -9,7 +9,6 @@
 /**
  * required files for getting data
  */
-require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';

+ 0 - 1
plugin/dashboard/block_student_graph/block_student_graph.class.php

@@ -13,7 +13,6 @@
  * required files for getting data
  */
 
-require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';