From e85b8f5375e894f52316ddc0213cf75506ccee24 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 29 Dec 2014 15:45:28 +0100 Subject: [PATCH 01/26] Minor - Adding missing variable --- main/survey/survey_list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php index 350f543fa7..cadefddf22 100755 --- a/main/survey/survey_list.php +++ b/main/survey/survey_list.php @@ -38,6 +38,7 @@ event_access_tool(TOOL_SURVEY); * of the code) */ +$courseInfo = api_get_course_info(); $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh( api_get_user_id(), $courseInfo From c839677b8cb4210f6b52132d95497f2fc3dde81c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 30 Dec 2014 14:59:50 +0100 Subject: [PATCH 02/26] Fixing queries see #7440 --- main/admin/access_url_check_user_session.php | 1 - main/admin/access_url_edit.php | 2 + main/admin/add_sessions_to_promotion.php | 10 +- main/admin/add_sessions_to_usergroup.php | 35 +- main/admin/course_list.php | 96 +++-- main/admin/course_request_accepted.php | 5 +- main/admin/user_list.php | 128 +++--- .../classes/CourseBuilder.class.php | 172 ++++---- main/coursecopy/copy_course_session.php | 4 +- main/exercice/exercice.php | 10 +- main/forum/forumfunction.inc.php | 2 +- main/gradebook/lib/be/category.class.php | 25 +- main/inc/lib/auth.lib.php | 48 ++- main/inc/lib/course.lib.php | 399 ++++++++++-------- main/inc/lib/course_category.lib.php | 44 +- main/inc/lib/database.lib.php | 104 +++-- main/inc/lib/document.lib.php | 42 +- main/inc/lib/group_portal_manager.lib.php | 61 +-- main/inc/lib/main_api.lib.php | 134 +++--- main/inc/lib/sessionmanager.lib.php | 56 ++- main/inc/lib/usermanager.lib.php | 44 +- main/inc/lib/userportal.lib.php | 2 +- main/newscorm/learnpath.class.php | 156 +++---- main/newscorm/lp_ajax_switch_item.php | 3 +- main/newscorm/lp_ajax_switch_item_toc.php | 9 +- main/reservation/rsys.php | 204 ++++----- .../default/auth/courses_categories.php | 19 +- main/webservices/registration.soap.php | 7 +- 28 files changed, 1046 insertions(+), 776 deletions(-) diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php index 098af8ff31..84d3afa222 100755 --- a/main/admin/access_url_check_user_session.php +++ b/main/admin/access_url_check_user_session.php @@ -56,7 +56,6 @@ $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' O $session_list = SessionManager::get_sessions_list(); - $html = ''; $show_users_with_problems = isset($_REQUEST['show_users_with_problems']) && $_REQUEST['show_users_with_problems'] == 1 ? true : false; if ($show_users_with_problems) { diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php index 167e666a8f..2a81157bd6 100755 --- a/main/admin/access_url_edit.php +++ b/main/admin/access_url_edit.php @@ -159,3 +159,5 @@ $form->addElement('file','url_image_3','URL Image 3 (PNG)'); // Submit button $form->addElement('style_submit_button', 'submit', $submit_name, 'class="add"'); $form->display(); + +Display::display_footer(); diff --git a/main/admin/add_sessions_to_promotion.php b/main/admin/add_sessions_to_promotion.php index 08767bf443..e34fca2aee 100755 --- a/main/admin/add_sessions_to_promotion.php +++ b/main/admin/add_sessions_to_promotion.php @@ -93,7 +93,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) { } $promotion_data = $promotion->get($id); -$session_list = SessionManager::get_sessions_list(array(), array('name')); +$session_list = SessionManager::get_sessions_list(array(), array('name')); $session_not_in_promotion = $session_in_promotion= array(); if (!empty($session_list)) { @@ -126,17 +126,19 @@ function search_sessions($needle, $type) $needle = Database::escape_string($needle); $needle = api_convert_encoding($needle, $charset, 'utf-8'); - $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%")); + $session_list = SessionManager::get_sessions_list( + array('s.name' => array('operator' => 'LIKE', 'value' => "$needle%")) + ); $return .= ''; $xajax_response -> addAssign('ajax_list_multiple','innerHTML',api_utf8_encode($return)); - } + return $xajax_response; } $xajax->processRequests(); diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php index 9edf901597..627ee5f39a 100755 --- a/main/admin/add_sessions_to_usergroup.php +++ b/main/admin/add_sessions_to_usergroup.php @@ -98,7 +98,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) { $elements_posted = array(); } if ($form_sent == 1) { - //added a parameter to send emails when registering a user + //added a parameter to send emails when registering a user $usergroup->subscribe_sessions_to_usergroup($id, $elements_posted); header('Location: usergroups.php'); exit; @@ -145,9 +145,13 @@ function search_sessions($needle,$type) { $order_clause. ' LIMIT 11';*/ } else if ($type == 'searchbox') { - $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "%$needle%")); + $session_list = SessionManager::get_sessions_list( + array('s.name' => array('operator' => 'LIKE', 'value' => "%$needle%")) + ); } else { - $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%")); + $session_list = SessionManager::get_sessions_list( + array('s.name' => array('operator' => 'LIKE', 'value' => "$needle%")) + ); } $i=0; if ($type=='single') { @@ -189,13 +193,10 @@ if ($add_type == 'multiple') { } echo '
'; -echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; +echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; echo ' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').''; echo '
'; - -?> - -'. get_lang('SearchSessions'); ?> : +echo '
> @@ -262,8 +263,8 @@ if(!empty($errorMsg)) {
-
@@ -313,9 +314,7 @@ if(!empty($errorMsg)) { '; -$form_sent=0; -$errorMsg=$firstLetterUser=$firstLetterSession=''; -$UserList=$SessionList=array(); -$sessions=array(); -$noPHP_SELF=true; +$form_sent = 0; +$errorMsg = $firstLetterUser = $firstLetterSession = ''; +$UserList = $SessionList = array(); +$sessions = array(); +$noPHP_SELF = true; if (isset($_POST['form_sent']) && $_POST['form_sent']) { $form_sent = $_POST['form_sent']; @@ -330,7 +332,8 @@ if ($ajax_search) { $sql = "SELECT user_id, lastname, firstname, username, id_session, official_code FROM $tbl_user u INNER JOIN $tbl_session_rel_user - ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." + ON $tbl_session_rel_user.id_user = u.user_id AND + $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND $tbl_session_rel_user.id_session = ".intval($id_session)." WHERE u.status<>".DRH." AND u.status<>6 $order_clause"; @@ -342,7 +345,8 @@ if ($ajax_search) { $sql="SELECT u.user_id, lastname, firstname, username, id_session, official_code FROM $tbl_user u INNER JOIN $tbl_session_rel_user - ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." + ON $tbl_session_rel_user.id_user = u.user_id AND + $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND $tbl_session_rel_user.id_session = ".intval($id_session)." INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id) WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6 @@ -438,8 +442,8 @@ if ($ajax_search) { } } - $result = Database::query($sql); - $users = Database::store_result($result,'ASSOC'); + $result = Database::query($sql); + $users = Database::store_result($result,'ASSOC'); foreach ($users as $uid => $user) { if ($user['id_session'] != $id_session) { $nosessionUsersList[$user['user_id']] = array( diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php index 90d3905858..91bce86f11 100755 --- a/main/inc/lib/database.lib.php +++ b/main/inc/lib/database.lib.php @@ -695,6 +695,9 @@ class Database $query = str_replace("'%__@", "'%", $query); $query = str_replace("@__%'", "%'", $query); + $query = str_replace('@__%"', "%'", $query); + $query = str_replace('"%__@', "'%", $query); + // Fixing doubles $query = str_replace("__@__@", "__@", $query); $query = str_replace("@__@__", "@__", $query); From fe2c21ec145fdeece079f6fee8958b59a1b1ec01 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 2 Jan 2015 09:04:03 +0100 Subject: [PATCH 09/26] Minor - format code --- main/inc/lib/display.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index b10ccf6d87..b196bf518e 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -67,7 +67,6 @@ class Display preg_match('/main\/([^*\/]+)/', $currentURL, $matches); $toolList = self::toolList(); if (!empty($matches)) { - foreach ($matches as $match) { if (in_array($match, $toolList)) { $help = explode('_', $match); @@ -599,8 +598,6 @@ class Display return ''.$name.''; } - - /** * Prints an