Browse Source

Added keyword \"static\" in classes that implement it - partial CT#387

Cristian Fasanando 15 years ago
parent
commit
91fe686d66

+ 9 - 9
main/inc/lib/legal.lib.php

@@ -20,7 +20,7 @@ class LegalManager {
 	 * @param string explain changes
 	 * @return boolean sucess
 	 */
-	public function add ($language, $content, $type, $changes) {
+	public static function add ($language, $content, $type, $changes) {
 		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$last = self::get_last_condition($language);
 		$language = Database::escape_string($language);
@@ -56,7 +56,7 @@ class LegalManager {
 		}
 	}
 
-	public function delete ($id) {
+	public static function delete ($id) {
 		/*
 		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$id = intval($id);
@@ -70,7 +70,7 @@ class LegalManager {
 	 * @return array all the info of a Term and condition
 	 */
 
-	public function get_last_condition_version ($language) {
+	public static function get_last_condition_version ($language) {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$language= Database::escape_string($language);
 		$sql = "SELECT version FROM $legal_conditions_table WHERE language_id = '".$language."' ORDER BY legal_id DESC LIMIT 1 ";
@@ -87,7 +87,7 @@ class LegalManager {
 	 * @param int the language id
 	 * @return array all the info of a Term and condition
 	 */
-	public function get_last_condition ($language) {
+	public static function get_last_condition ($language) {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$language= Database::escape_string($language);
 		$sql = "SELECT * FROM $legal_conditions_table WHERE language_id = '".$language."' ORDER BY version DESC LIMIT 1 ";
@@ -100,7 +100,7 @@ class LegalManager {
 	 * @param int the language id
 	 * @return boolean | int the version or false if does not exist
 	 */
-	public function get_last_version ($language) {
+	public static function get_last_version ($language) {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$language= Database::escape_string($language);
 		$sql = "SELECT version FROM $legal_conditions_table WHERE language_id = '".$language."' ORDER BY version DESC LIMIT 1 ";
@@ -119,7 +119,7 @@ class LegalManager {
 	 * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
 	 * @return string html preview
 	 */
-	public function show_last_condition ($term_preview) {
+	public static function show_last_condition ($term_preview) {
 		$preview = '';
 		switch ($term_preview['type']) {
 			/*// scroll box
@@ -178,7 +178,7 @@ class LegalManager {
 	 * @param int column
 	 * @return array
 	 */
-	public function get_legal_data ($from, $number_of_items, $column) {
+	public static function get_legal_data ($from, $number_of_items, $column) {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
 		$from = intval($from);
@@ -213,7 +213,7 @@ class LegalManager {
 	 * Gets the number of terms and conditions available
 	 * @return int
 	 */
-	public function count() {
+	public static function count() {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$sql = "SELECT count(*) as count_result FROM $legal_conditions_table ORDER BY legal_id DESC ";
 		$result = Database::query($sql, __FILE__, __LINE__);
@@ -228,7 +228,7 @@ class LegalManager {
 	 * @param int The language id
 	 * @return int The current type of terms and conditions
 	 */
-	public function get_type_of_terms_and_conditions ($legal_id,$language_id) {
+	public static function get_type_of_terms_and_conditions ($legal_id,$language_id) {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$legal_id=Database::escape_string($legal_id);
 		$language_id=Database::escape_string($language_id);

+ 1 - 1
main/inc/lib/sessionmanager.lib.php

@@ -905,7 +905,7 @@ class SessionManager {
 	 * @param bool  	- optional, if is true the user don't be a coach now, otherwise it'll assign a coach
 	 * @return bool true if there are affected rows, otherwise false
 	 */
-	function set_coach_to_course_session($user_id, $session_id = 0, $course_code = '',$nocoach = false) {
+	public static function set_coach_to_course_session($user_id, $session_id = 0, $course_code = '',$nocoach = false) {
 
 		// Definition of variables
 		$user_id = intval($user_id);

+ 5 - 5
main/inc/lib/social.lib.php

@@ -424,7 +424,7 @@ class SocialManager extends UserManager {
 	 * @author  Yannick Warnier
 	 * @since   Dokeos 1.8.6.1
 	 */
-	function get_user_feeds($user, $limit=5) {
+	public static function get_user_feeds($user, $limit=5) {
 	    if (!function_exists('fetch_rss')) { return '';}
 		$fields = UserManager::get_extra_fields();
 	    $feed_fields = array();
@@ -456,7 +456,7 @@ class SocialManager extends UserManager {
 	/**
 	 * Helper functions definition
 	 */
-	function get_logged_user_course_html($my_course, $count) {
+	public static function get_logged_user_course_html($my_course, $count) {
 		global $nosession;
 		if (api_get_setting('use_session_mode')=='true' && !$nosession) {
 			global $now, $date_start, $date_end;
@@ -871,7 +871,7 @@ class SocialManager extends UserManager {
 	 * Displays a sortable table with the list of online users.
 	 * @param array $user_list
 	 */
-	function display_user_list($user_list) {
+	public static function display_user_list($user_list) {
 		global $charset;
 		if ($_GET['id'] == '') {
 			$extra_params = array();
@@ -924,7 +924,7 @@ class SocialManager extends UserManager {
 	 * Displays the information of an individual user
 	 * @param int $user_id
 	 */
-	function display_individual_user($user_id) {
+	public static function display_individual_user($user_id) {
 		global $interbreadcrumb;
 		$safe_user_id = Database::escape_string($user_id);
 	
@@ -1024,7 +1024,7 @@ class SocialManager extends UserManager {
 	 * @param int $user_id User id
 	 * @todo use the correct api_get_path instead of $clarolineRepositoryWeb
 	 */
-	function display_productions($user_id) {
+	public static function display_productions($user_id) {
 		$sysdir_array = UserManager::get_user_picture_path_by_id($user_id, 'system', true);
 		$sysdir = $sysdir_array['dir'].$user_id.'/';
 		$webdir_array = UserManager::get_user_picture_path_by_id($user_id, 'web', true);

+ 4 - 2
main/inc/lib/surveymanager.lib.php

@@ -522,7 +522,7 @@ class SurveyManager {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, cleanup and refactoring
 	 *
 	 */
-	function delete_survey($survey_id)
+	public static function delete_survey($survey_id)
 	{
 		$table_survey 	= Database :: get_course_table(TABLE_SURVEY);
 		$table_group 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
@@ -814,7 +814,9 @@ class SurveyManager {
      }
    }
 
-
+	/**
+	 *  Possible  deprecated method
+	 */
    function update_group($groupid,$surveyid,$groupnamme,$introduction,$curr_dbname)
 	{
 		$sql = "UPDATE $curr_dbname.survey_group SET group_id='$groupid', survey_id='$surveyid', groupname='$groupnamme', introduction='$introduction' WHERE group_id='$groupid'";

+ 11 - 11
main/inc/lib/system_announcements.lib.php

@@ -17,7 +17,7 @@ class SystemAnnouncementManager
 	 * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
 	 * @param int $id The identifier of the announcement to display
 	 */
-	function display_announcements($visible, $id = -1)
+	public static function display_announcements($visible, $id = -1)
 	{
 		$user_selected_language = api_get_interface_language();
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
@@ -92,7 +92,7 @@ class SystemAnnouncementManager
 		return;
 	}
 
-	function display_all_announcements($visible, $id = -1,$start = 0,$user_id='')
+	public static function display_all_announcements($visible, $id = -1,$start = 0,$user_id='')
 	{
 		$user_selected_language = api_get_interface_language();
 
@@ -162,7 +162,7 @@ class SystemAnnouncementManager
 		return;
 	}
 
-	function display_fleche($user_id)
+	public static function display_fleche($user_id)
 	{
 		$start = (int)$_GET['start'];
 		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
@@ -186,7 +186,7 @@ class SystemAnnouncementManager
 
 	}
 
-	function count_nb_announcement($start = 0,$user_id = '')
+	public static function count_nb_announcement($start = 0,$user_id = '')
 	{
 		$start = intval($start);
 		$visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUDENT;
@@ -224,7 +224,7 @@ class SystemAnnouncementManager
 	 * @return array An array with all available system announcements (as php
 	 * objects)
 	 */
-	function get_all_announcements()
+	public static function get_all_announcements()
 	{
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 
@@ -244,7 +244,7 @@ class SystemAnnouncementManager
 	 * @param string $date_start Start date (YYYY-MM-DD HH:II: SS)
 	 * @param string $date_end End date (YYYY-MM-DD HH:II: SS)
 	 */
-	function add_announcement($title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0, $lang = null, $send_mail=0)
+	public static function add_announcement($title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0, $lang = null, $send_mail=0)
 	{
 
 		$a_dateS = explode(' ',$date_start);
@@ -291,7 +291,7 @@ class SystemAnnouncementManager
 	 * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
 	 * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
 	 */
-	function update_announcement($id, $title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0,$lang=null, $send_mail=0)
+	public static function update_announcement($id, $title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0,$lang=null, $send_mail=0)
 	{
 
 		$a_dateS = explode(' ',$date_start);
@@ -335,7 +335,7 @@ class SystemAnnouncementManager
 	 * @param integer $id The identifier of the announcement that should be
 	 * deleted
 	 */
-	function delete_announcement($id)
+	public static function delete_announcement($id)
 	{
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 		$id = intval($id);
@@ -347,7 +347,7 @@ class SystemAnnouncementManager
 	 * @param integer $id The identifier of the announcement that should be
 	 * deleted
 	 */
-	function get_announcement($id)
+	public static function get_announcement($id)
 	{
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 		$id = intval($id);
@@ -361,7 +361,7 @@ class SystemAnnouncementManager
 	 * @param integer $user For who should the visibility be changed (possible
 	 * values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
 	 */
-	function set_visibility($announcement_id, $user, $visible)
+	public static function set_visibility($announcement_id, $user, $visible)
 	{
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 		$announcement_id = intval($announcement_id);
@@ -370,7 +370,7 @@ class SystemAnnouncementManager
 		return Database::query($sql,__FILE__,__LINE__);
 	}
 
-	function send_system_announcement_by_email($title,$content,$teacher, $student)
+	public static function send_system_announcement_by_email($title,$content,$teacher, $student)
 	{
 		global $_user;
 		global $_setting;

+ 31 - 31
main/inc/lib/tracking.lib.php

@@ -41,7 +41,7 @@ class Tracking {
 	 * @param integer $user_id the user id
 	 * @return timestamp $nb_seconds
 	 */
-	function get_time_spent_on_the_platform($user_id) {
+	public static function get_time_spent_on_the_platform($user_id) {
 
 		$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
 
@@ -89,7 +89,7 @@ class Tracking {
 	 * @param string $course_code the course code
 	 * @return timestamp $nb_seconds
 	 */
-	function get_time_spent_on_the_course($user_id, $course_code) {
+	public static function get_time_spent_on_the_course($user_id, $course_code) {
 		// protect datas
 		$user_id = intval($user_id);
 		$course_code = addslashes($course_code);		
@@ -108,7 +108,7 @@ class Tracking {
 		return $row['nb_seconds']; 
 	}
 
-	function get_first_connection_date($student_id) {
+	public static function get_first_connection_date($student_id) {
 		$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
 		$sql = 'SELECT login_date FROM ' . $tbl_track_login . '
 						WHERE login_user_id = ' . intval($student_id) . '
@@ -124,7 +124,7 @@ class Tracking {
 		return false;
 	}
 
-	function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false) {
+	public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false) {
 		$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
 		$sql = 'SELECT login_date FROM ' . $tbl_track_login . '
 						WHERE login_user_id = ' . intval($student_id) . '
@@ -167,7 +167,7 @@ class Tracking {
 		return false;
 	}
 
-	function get_first_connection_date_on_the_course($student_id, $course_code) {
+	public static function get_first_connection_date_on_the_course($student_id, $course_code) {
 		$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 		$sql = 'SELECT login_course_date FROM ' . $tbl_track_login . '
 						WHERE user_id = ' . intval($student_id) . '
@@ -184,7 +184,7 @@ class Tracking {
 		return false;
 	}
 
-	function get_last_connection_date_on_the_course($student_id, $course_code) {
+	public static function get_last_connection_date_on_the_course($student_id, $course_code) {
 		$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 		$sql = 'SELECT login_course_date FROM ' . $tbl_track_login . '
 						WHERE user_id = ' . intval($student_id) . '
@@ -209,7 +209,7 @@ class Tracking {
 		return false;
 	}
 
-	function count_course_per_student($user_id) {
+	public static function count_course_per_student($user_id) {
 
 		$user_id = intval($user_id);
 		$tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -236,7 +236,7 @@ class Tracking {
 	 * @param string $course_code - Course id
 	 * @return string value (number %) Which represents a round integer about the score average.
 	 */
-	function get_avg_student_exercise_score($student_id, $course_code) {
+	public static function get_avg_student_exercise_score($student_id, $course_code) {
 
 		// protect datas
 		$course_code = Database::escape_string($course_code);
@@ -280,7 +280,7 @@ class Tracking {
 		return null;		
 	}
 
-	function get_avg_student_progress($student_id, $course_code) {		
+	public static function get_avg_student_progress($student_id, $course_code) {		
 		// protect datas
 		$course_code = addslashes($course_code);
 		// get the informations of the course
@@ -321,7 +321,7 @@ class Tracking {
 	 * @param Array limit average to listed lp ids
 	 * @return string value (number %) Which represents a round integer explain in got in 3.
 	 */
-	function get_avg_student_score($student_id, $course_code, $lp_ids=array()) {
+	public static function get_avg_student_score($student_id, $course_code, $lp_ids=array()) {
 		$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
 		$course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 		$table_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@@ -518,7 +518,7 @@ class Tracking {
 	 * @param integer $coach_id the id of the coach
 	 * @return Array the list of students
 	 */
-	function get_student_followed_by_coach($coach_id) {
+	public static function get_student_followed_by_coach($coach_id) {
 		$coach_id = intval($coach_id);
 
 		$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@@ -602,7 +602,7 @@ class Tracking {
 		return $a_students;
 	}
 
-	function get_student_followed_by_coach_in_a_session($id_session, $coach_id) {
+	public static function get_student_followed_by_coach_in_a_session($id_session, $coach_id) {
 
 		$coach_id = intval($coach_id);
 
@@ -650,7 +650,7 @@ class Tracking {
 		return $a_students;
 	}
 
-	function is_allowed_to_coach_student($coach_id, $student_id) {
+	public static function is_allowed_to_coach_student($coach_id, $student_id) {
 		$coach_id = intval($coach_id);
 		$student_id = intval($student_id);
 
@@ -696,7 +696,7 @@ class Tracking {
 
 	}
 
-	function get_courses_followed_by_coach($coach_id, $id_session = '')
+	public static function get_courses_followed_by_coach($coach_id, $id_session = '')
 	{
 
 		$coach_id = intval($coach_id);
@@ -776,7 +776,7 @@ class Tracking {
 		return $a_courses;
 	}
 
-	function get_sessions_coached_by_user($coach_id) {
+	public static function get_sessions_coached_by_user($coach_id) {
 		// table definition
 		$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 		$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
@@ -869,7 +869,7 @@ class Tracking {
 
 	}
 
-	function get_courses_list_from_session($session_id) {
+	public static function get_courses_list_from_session($session_id) {
 		//protect datas
 		$session_id = intval($session_id);
 
@@ -889,7 +889,7 @@ class Tracking {
 		return $a_courses;
 	}
 
-	function count_student_assignments($student_id, $course_code) {
+	public static function count_student_assignments($student_id, $course_code) {
 		require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
 
 		// protect datas		
@@ -913,7 +913,7 @@ class Tracking {
 		return null;		
 	}
 
-	function count_student_messages($student_id, $course_code) {
+	public static function count_student_messages($student_id, $course_code) {
 		require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
 
 		// protect datas
@@ -944,7 +944,7 @@ class Tracking {
 * @author Christian Fasanando <christian.fasanando@dokeos.com>,
 * @version enero 2009, dokeos 1.8.6
 */
-	function count_number_of_posts_by_course($course_code) {
+	public static function count_number_of_posts_by_course($course_code) {
 		//protect data
 		$course_code = addslashes($course_code);
 		// get the informations of the course
@@ -969,7 +969,7 @@ class Tracking {
 * @author Christian Fasanando <christian.fasanando@dokeos.com>,
 * @version enero 2009, dokeos 1.8.6
 */
-	function count_number_of_threads_by_course($course_code) {
+	public static function count_number_of_threads_by_course($course_code) {
 		//protect data
 		$course_code = addslashes($course_code);
 		// get the informations of the course
@@ -994,7 +994,7 @@ class Tracking {
 * @author Christian Fasanando <christian.fasanando@dokeos.com>,
 * @version enero 2009, dokeos 1.8.6
 */
-	function count_number_of_forums_by_course($course_code) {
+	public static function count_number_of_forums_by_course($course_code) {
 		//protect data
 		$course_code = addslashes($course_code);
 		// get the informations of the course
@@ -1020,7 +1020,7 @@ class Tracking {
 * @author Christian Fasanando <christian.fasanando@dokeos.com>,
 * @version enero 2009, dokeos 1.8.6
 */
-	function chat_connections_during_last_x_days_by_course($course_code,$last_days) {
+	public static function chat_connections_during_last_x_days_by_course($course_code,$last_days) {
 		//protect data
 		$last_days = intval($last_days);
 		$course_code = addslashes($course_code);
@@ -1050,7 +1050,7 @@ class Tracking {
 * @author Christian Fasanando <christian.fasanando@dokeos.com>,
 * @version enero 2009, dokeos 1.8.6
 */
-	function chat_last_connection($student_id,$course_code) {
+	public static function chat_last_connection($student_id,$course_code) {
 		require_once (api_get_path(LIBRARY_PATH) . 'course.lib.php');
 
 		//protect datas
@@ -1081,7 +1081,7 @@ class Tracking {
 		}
 	}
 
-	function count_student_visited_links($student_id, $course_code) {
+	public static function count_student_visited_links($student_id, $course_code) {
 		// protect datas
 		$student_id = intval($student_id);
 		$course_code = addslashes($course_code);
@@ -1098,7 +1098,7 @@ class Tracking {
 		return Database::num_rows($rs);
 	}
 
-	function count_student_downloaded_documents($student_id, $course_code) {
+	public static function count_student_downloaded_documents($student_id, $course_code) {
 		// protect datas
 		$student_id = intval($student_id);
 		$course_code = addslashes($course_code);
@@ -1115,7 +1115,7 @@ class Tracking {
 		return Database::num_rows($rs);
 	}
 
-	function get_course_list_in_session_from_student($user_id, $id_session) {
+	public static function get_course_list_in_session_from_student($user_id, $id_session) {
 		$user_id = intval($user_id);
 		$id_session = intval($id_session);
 		$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@@ -1128,7 +1128,7 @@ class Tracking {
 		return $a_courses;
 	}
 
-	function get_inactives_students_in_course($course_code, $since, $session_id=0)
+	public static function get_inactives_students_in_course($course_code, $since, $session_id=0)
 	{
 		$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 		$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@@ -1164,7 +1164,7 @@ class Tracking {
 		return $inactive_users;
 	}
 
-	function count_login_per_student($student_id, $course_code) {
+	public static function count_login_per_student($student_id, $course_code) {
 		$student_id = intval($student_id);
 		$course_code = addslashes($course_code);
 		$tbl_course_rel_user = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS);
@@ -1181,7 +1181,7 @@ class Tracking {
 	}
 
 
-	function get_student_followed_by_drh($hr_dept_id) {
+	public static function get_student_followed_by_drh($hr_dept_id) {
 
 		$hr_dept_id = intval($hr_dept_id);
 		$a_students = array ();
@@ -1207,7 +1207,7 @@ class Tracking {
 	 * @param int the user id
 	 * @param string the course id
 	 */
-	function get_average_test_scorm_and_lp ($user_id,$course_id) {
+	public static function get_average_test_scorm_and_lp ($user_id,$course_id) {
 		
 		//the score inside the Reporting table
 		$course_info=api_get_course_info($course_id);
@@ -1276,4 +1276,4 @@ class Tracking {
 	}
 				
 }
-?>
+?>

+ 29 - 29
main/inc/lib/urlmanager.lib.php

@@ -40,7 +40,7 @@ class UrlManager
 	  * @param  int     the user_id of the owner
 	  * @return boolean if success
 	  */
-	function add($url, $description, $active)
+	public static function add($url, $description, $active)
 	{
 		$tms = time();
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
@@ -64,7 +64,7 @@ class UrlManager
 	* @param	int     the user_id of the owner
 	* @return 	boolean if success
 	*/
-	function udpate($url_id, $url, $description, $active)
+	public static function udpate($url_id, $url, $description, $active)
 	{
 		$url_id = intval($url_id);
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
@@ -87,7 +87,7 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	function delete($id)
+	public static function delete($id)
 	{
 		$id = intval($id);
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
@@ -99,7 +99,7 @@ class UrlManager
 	/**
 	 *
 	 * */
-	function url_exist($url)
+	public static function url_exist($url)
 	{
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."' ";
@@ -111,7 +111,7 @@ class UrlManager
 	/**
 	 *
 	 * */
-	function url_id_exist($url)
+	public static function url_id_exist($url)
 	{
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT id FROM $table_access_url WHERE id = '".Database::escape_string($url)."' ";
@@ -125,7 +125,7 @@ class UrlManager
 	 * @author Julio Montoya
 	 * @return int count of urls
 	 * */
-	function url_count()
+	public static function url_count()
 	{
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT count(id) as count_result FROM $table_access_url";
@@ -140,7 +140,7 @@ class UrlManager
 	 * @author Julio Montoya
 	 * @return array
 	 * */
-	function get_url_data()
+	public static function get_url_data()
 	{
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT id, url, description, active  FROM $table_access_url";
@@ -157,7 +157,7 @@ class UrlManager
 	 * @author Julio Montoya
 	 * @return array
 	 * */
-	function get_url_data_from_id($url_id)
+	public static function get_url_data_from_id($url_id)
 	{		
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT id, url, description, active FROM $table_access_url WHERE id = ".Database::escape_string($url_id);
@@ -171,7 +171,7 @@ class UrlManager
 	 * @return int  access url id
 	 * @return array   Database::store_result of the result
 	 * */
-	function get_url_rel_user_data($access_url_id='')
+	public static function get_url_rel_user_data($access_url_id='')
 	{
 		$where = '';
 		$table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -196,7 +196,7 @@ class UrlManager
 	 * @return int  access url id
 	 * @return array   Database::store_result of the result
 	 * */
-	function get_url_rel_course_data($access_url_id='')
+	public static function get_url_rel_course_data($access_url_id='')
 	{
 		$where ='';
 		$table_url_rel_course	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -222,7 +222,7 @@ class UrlManager
 	 * @return int  access url id
 	 * @return array   Database::store_result of the result
 	 * */
-	function get_url_rel_session_data($access_url_id='')
+	public static function get_url_rel_session_data($access_url_id='')
 	{
 		$where ='';
 		$table_url_rel_session	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -251,7 +251,7 @@ class UrlManager
 	 * @param string lock || unlock
 	 * @param int url id
 	 * */
-	function set_url_status($status, $url_id)
+	public static function set_url_status($status, $url_id)
 	{
 		$url_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		if ($status=='lock') {
@@ -273,7 +273,7 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	function relation_url_user_exist($user_id, $url_id)
+	public static function relation_url_user_exist($user_id, $url_id)
 	{
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 		$sql= "SELECT user_id FROM $table_url_rel_user WHERE access_url_id = ".Database::escape_string($url_id)." AND  user_id = ".Database::escape_string($user_id)." ";
@@ -289,7 +289,7 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	function relation_url_course_exist($course_id, $url_id)
+	public static function relation_url_course_exist($course_id, $url_id)
 	{
 		$table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 		$sql= "SELECT course_code FROM $table_url_rel_course WHERE access_url_id = ".Database::escape_string($url_id)." AND course_code = '".Database::escape_string($course_id)."'";
@@ -306,7 +306,7 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	function relation_url_session_exist($session_id, $url_id)
+	public static function relation_url_session_exist($session_id, $url_id)
 	{
 		$table_url_rel_session= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 		$sql= "SELECT session_id FROM $table_url_rel_session WHERE access_url_id = ".Database::escape_string($url_id)." AND session_id = ".Database::escape_string($session_id);
@@ -322,7 +322,7 @@ class UrlManager
 	 * @param  array of user_ids
 	 * @param  array of url_ids
 	 * */
-	function add_users_to_urls($user_list, $url_list)
+	public static function add_users_to_urls($user_list, $url_list)
 	{
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 		$result_array=array();
@@ -353,7 +353,7 @@ class UrlManager
 	 * @param  array of course ids
 	 * @param  array of url_ids
 	 * */
-	function add_courses_to_urls($course_list,$url_list)
+	public static function add_courses_to_urls($course_list,$url_list)
 	{
 		$table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 		$result_array=array();
@@ -384,7 +384,7 @@ class UrlManager
 	 * @param  array of session ids
 	 * @param  array of url_ids
 	 * */
-	function add_sessions_to_urls($session_list,$url_list)
+	public static function add_sessions_to_urls($session_list,$url_list)
 	{
 		$table_url_rel_session= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 		$result_array=array();
@@ -417,7 +417,7 @@ class UrlManager
 	 * @param  url_id
 	 * @return boolean true if success
 	 * */
-	function add_user_to_url($user_id, $url_id=1)
+	public static function add_user_to_url($user_id, $url_id=1)
 	{
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 		if (empty($url_id)) $url_id=1;
@@ -430,7 +430,7 @@ class UrlManager
 		return $result;
 	}
 
-	function add_course_to_url($course_code, $url_id=1)
+	public static function add_course_to_url($course_code, $url_id=1)
 	{
 		$table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 		if (empty($url_id)) $url_id=1;
@@ -444,7 +444,7 @@ class UrlManager
 	}
 
 
-	function add_session_to_url($session_id, $url_id=1)
+	public static function add_session_to_url($session_id, $url_id=1)
 	{
 		$table_url_rel_session= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 		if (empty($url_id)) $url_id=1;
@@ -465,7 +465,7 @@ class UrlManager
 	* @param int url id
 	* @return boolean true if success
 	* */
-	function delete_url_rel_user($user_id, $url_id)
+	public static function delete_url_rel_user($user_id, $url_id)
 	{
 		$table_url_rel_user= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 		$sql= "DELETE FROM $table_url_rel_user WHERE user_id = ".Database::escape_string($user_id)." AND access_url_id=".Database::escape_string($url_id)."  ";
@@ -480,7 +480,7 @@ class UrlManager
 	* @param  int url id
 	* @return boolean true if success
 	* */
-	function delete_url_rel_course($course_code, $url_id)
+	public static function delete_url_rel_course($course_code, $url_id)
 	{
 		$table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 		$sql= "DELETE FROM $table_url_rel_course WHERE course_code = '".Database::escape_string($course_code)."' AND access_url_id=".Database::escape_string($url_id)."  ";
@@ -495,7 +495,7 @@ class UrlManager
 	* @param  int url id
 	* @return boolean true if success
 	* */
-	function delete_url_rel_session($session_id, $url_id)
+	public static function delete_url_rel_session($session_id, $url_id)
 	{
 		$table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 		$sql= "DELETE FROM $table_url_rel_session WHERE session_id = ".Database::escape_string($session_id)." AND access_url_id=".Database::escape_string($url_id)."  ";
@@ -510,7 +510,7 @@ class UrlManager
 	 * @param array user list
 	 * @param int access_url_id
 	 * */
-	function update_urls_rel_user($user_list,$access_url_id)
+	public static function update_urls_rel_user($user_list,$access_url_id)
 	{
 		$table_access_url	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -544,7 +544,7 @@ class UrlManager
 	 * @param array user list
 	 * @param int access_url_id
 	 * */
-	function update_urls_rel_course($course_list,$access_url_id)
+	public static function update_urls_rel_course($course_list,$access_url_id)
 	{
 		$table_course			= Database :: get_main_table(TABLE_MAIN_COURSE);
 		$table_url_rel_course	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -578,7 +578,7 @@ class UrlManager
 	 * @param array user list
 	 * @param int access_url_id
 	 * */
-	function update_urls_rel_session($session_list,$access_url_id)
+	public static function update_urls_rel_session($session_list,$access_url_id)
 	{
 		$table_session	= Database :: get_main_table(TABLE_MAIN_SESSION);
 		$table_url_rel_session	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -607,7 +607,7 @@ class UrlManager
 	}
 
 
-	function get_access_url_from_user($user_id) {
+	public static function get_access_url_from_user($user_id) {
 		$table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 		$table_url	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT url, access_url_id FROM $table_url_rel_user url_rel_user INNER JOIN $table_url u
@@ -621,7 +621,7 @@ class UrlManager
 	/**
 	 *
 	 * */
-	function get_url_id($url)
+	public static function get_url_id($url)
 	{
 		$table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
 		$sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."'";

+ 5 - 5
main/inc/lib/usermanager.lib.php

@@ -505,7 +505,7 @@ class UserManager
     * @return array An array with all users of the platform.
     * @todo optional course code parameter, optional sorting parameters...
     */
-    function get_user_list_like($conditions = array(), $order_by = array()) {
+    public static function get_user_list_like($conditions = array(), $order_by = array()) {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);
         $return_array = array();
         $sql_query = "SELECT * FROM $user_table";
@@ -2142,7 +2142,7 @@ class UserManager
      * @return  boolean True if is admin, false otherwise
      * @see main_api.lib.php::api_is_platform_admin() for a context-based check
      */
-    function is_admin($user_id) {
+    public static function is_admin($user_id) {
         if (empty($user_id) or $user_id != strval(intval($user_id))) { return false; }
         $admin_table = Database::get_main_table(TABLE_MAIN_ADMIN);
         $sql = "SELECT * FROM $admin_table WHERE user_id = $user_id";
@@ -2685,7 +2685,7 @@ class UserManager
 	 * @param string the value of the search box
 	 * 
 	 */
-	public function get_search_form($query) {
+	public static function get_search_form($query) {
 		echo'<form method="get" action="'.api_get_path(WEB_PATH).'main/social/search.php">
 
 		<table cellspacing="0" cellpadding="0" id="SearchTable">
@@ -2704,7 +2704,7 @@ class UserManager
 		</tbody></table></form>';
 	}
 	//deprecated
-	public function get_public_users($keyword, $from = 0, $number_of_items= 20, $column=2, $direction='ASC') {	
+	public static function get_public_users($keyword, $from = 0, $number_of_items= 20, $column=2, $direction='ASC') {	
 			
 			$admin_table = Database :: get_main_table(TABLE_MAIN_ADMIN);
 			$sql = "SELECT
@@ -2777,7 +2777,7 @@ class UserManager
 	/**
 	 * Shows the user menu 
 	 */
-	function show_menu(){
+	public static function show_menu(){
 		echo '<div class="actions">';
 		echo '<a href="/main/auth/profile.php">'.	Display::return_icon('profile.png').' '.get_lang('PersonalData').'</a>';
 		echo '<a href="/main/messages/inbox.php">'.	Display::return_icon('inbox.png').' '.	get_lang('Inbox').'</a>';