From 0a62f50e938b4a99f0f97dd82e9a4bb9523c6b31 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 25 Jul 2014 18:49:22 +0200 Subject: [PATCH] Format code, fixing PHP warnings, removing old comments. --- main/admin/access_url_add_users_to_url.php | 6 ++-- main/admin/access_url_check_user_session.php | 20 +++++------ main/admin/access_url_edit.php | 9 ++--- ...access_url_edit_course_category_to_url.php | 2 +- main/admin/access_url_edit_courses_to_url.php | 20 ++++------- main/admin/access_url_edit_users_to_url.php | 4 +-- main/admin/access_urls.php | 9 ++--- main/admin/add_courses_to_session.php | 2 +- main/admin/add_courses_to_usergroup.php | 3 +- main/admin/add_many_session_to_category.php | 1 - main/admin/add_sessions_to_promotion.php | 3 +- main/admin/add_sessions_to_usergroup.php | 35 ++++++++----------- main/admin/add_users_to_group.php | 4 --- main/admin/archive_cleanup.php | 2 +- main/admin/configure_extensions.php | 7 ++-- main/admin/course_import.php | 6 ++-- main/admin/course_request_accepted.php | 1 + main/admin/course_request_rejected.php | 6 ++-- main/admin/dashboard_add_users_to_user.php | 1 - main/admin/group_add.php | 34 +++++++++++------- main/admin/statistics/index.php | 3 +- main/gradebook/lib/be/category.class.php | 14 ++++---- main/gradebook/lib/fe/linkform.class.php | 1 + main/group/group.php | 2 -- main/group/group_creation.php | 6 ++-- 25 files changed, 96 insertions(+), 105 deletions(-) diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php index 1ccbfdb49f..fe281f3865 100755 --- a/main/admin/access_url_add_users_to_url.php +++ b/main/admin/access_url_add_users_to_url.php @@ -12,13 +12,13 @@ $language_file = 'admin'; $cidReset = true; require_once '../inc/global.inc.php'; -$this_section=SECTION_PLATFORM_ADMIN; +$this_section = SECTION_PLATFORM_ADMIN; require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php'; api_protect_global_admin_script(); if (!api_get_multiple_access_url()) { - header('Location: index.php'); - exit; + header('Location: index.php'); + exit; } $form_sent = 0; diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php index d6ec3e41ba..098af8ff31 100755 --- a/main/admin/access_url_check_user_session.php +++ b/main/admin/access_url_check_user_session.php @@ -34,14 +34,14 @@ $url_id = api_get_current_access_url_id(); $action = $_GET['action']; switch($action) { - case 'add_user_to_url': + case 'add_user_to_url': $user_id = $_REQUEST['user_id']; $result = UrlManager::add_user_to_url($user_id, $url_id); $user_info = api_get_user_info($user_id); if ($result) { $message = Display::return_message(get_lang('UserAdded').' '.api_get_person_name($user_info['firstname'], $user_info['lastname']), 'confirm'); } - break; + break; } Display::display_header($tool_name); @@ -69,7 +69,7 @@ if ($show_users_with_problems) { foreach($session_list as $session_item) { $session_id = $session_item['id']; $html .= '

'.$session_item['name'].'

'; - + $access_where = "(access_url_id = $url_id OR access_url_id is null )"; if ($show_users_with_problems) { $access_where = "(access_url_id is null)"; @@ -85,24 +85,24 @@ foreach($session_list as $session_item) { $result = Database::query($sql); $users = Database::store_result($result); - + if (!empty($users)) { - $html .= ''; - + $html .= '
'.get_lang('User').''.get_lang('Actions').'
'; + foreach ($users as $user) { $user_link = ''; if (!empty($user['user_id'])) { - $user_link = ''.api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')'; + $user_link = ''.Security::remove_XSS(api_get_person_name($user['firstname'], $user['lastname'])).' ('.$user['username'].')'; } $link_to_add_user_in_url = ''; if ($multiple_url_is_on) { - if ($user['access_url_id'] != $url_id) { + if ($user['access_url_id'] != $url_id) { $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), ICON_SIZE_MEDIUM); - $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), ICON_SIZE_MEDIUM); + $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), ICON_SIZE_MEDIUM); $link_to_add_user_in_url = ''.$add.''; - } + } } $html .= '
'.get_lang('User').''.get_lang('Actions').'
diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php index d2927c3946..167e666a8f 100755 --- a/main/admin/access_url_edit.php +++ b/main/admin/access_url_edit.php @@ -111,8 +111,8 @@ $form->addRule('url', '', 'maxlength',254); $form->addElement('textarea','description',get_lang('Description')); //the first url with id = 1 will be always active -if ($_GET['url_id'] != 1) { - $form->addElement('checkbox','active', null, get_lang('Active')); +if (isset($_GET['url_id']) && $_GET['url_id'] != 1) { + $form->addElement('checkbox','active', null, get_lang('Active')); } $defaults['url']='http://'; @@ -132,14 +132,15 @@ if (isset($_GET['url_id'])) { $submit_name = get_lang('AddUrl'); } -if (!$_configuration['multiple_access_urls']) { - header('Location: index.php'); +if (!api_is_multiple_url_enabled()) { + header('Location: index.php'); exit; } $tool_name = get_lang('AddUrl'); $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); $interbreadcrumb[] = array ("url" => 'access_urls.php', "name" => get_lang('MultipleAccessURLs')); + Display :: display_header($tool_name); if (isset ($_GET['action'])) { diff --git a/main/admin/access_url_edit_course_category_to_url.php b/main/admin/access_url_edit_course_category_to_url.php index d6e8495815..e9e3b81067 100755 --- a/main/admin/access_url_edit_course_category_to_url.php +++ b/main/admin/access_url_edit_course_category_to_url.php @@ -184,7 +184,7 @@ if (!empty($errorMsg)) { - diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php index f26adf77fe..0bf19a37c9 100755 --- a/main/admin/access_url_edit_courses_to_url.php +++ b/main/admin/access_url_edit_courses_to_url.php @@ -46,14 +46,13 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') { } $access_url_id=1; -if(isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!=''){ +if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!='') { $access_url_id = Security::remove_XSS($_REQUEST['access_url_id']); } $xajax -> processRequests(); $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); -$htmlHeadXtra[] = ' -processRequests(); $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); -$htmlHeadXtra[] = ' -'; @@ -92,9 +91,9 @@ $errorMsg = ''; $sessions=array(); $usergroup = new UserGroup(); $id = intval($_GET['id']); -if($_POST['form_sent']) { - $form_sent = $_POST['form_sent']; - $elements_posted = $_POST['elements_in_name']; +if (isset($_POST['form_sent']) && $_POST['form_sent']) { + $form_sent = $_POST['form_sent']; + $elements_posted = $_POST['elements_in_name']; if (!is_array($elements_posted)) { $elements_posted = array(); } @@ -102,7 +101,7 @@ if($_POST['form_sent']) { //added a parameter to send emails when registering a user $usergroup->subscribe_sessions_to_usergroup($id, $elements_posted); header('Location: usergroups.php'); - exit; + exit; } } $data = $usergroup->get($id); @@ -113,9 +112,9 @@ $session_list = SessionManager::get_sessions_list(array(), array('name')); $elements_not_in = $elements_in= array(); if (!empty($session_list)) { - foreach($session_list as $session) { - if (in_array($session['id'], $session_list_in)) { - $elements_in[$session['id']] = $session['name']; + foreach($session_list as $session) { + if (in_array($session['id'], $session_list_in)) { + $elements_in[$session['id']] = $session['name']; } else { $elements_not_in[$session['id']] = $session['name']; } @@ -130,7 +129,7 @@ function search_sessions($needle,$type) { global $tbl_user,$elements_in; $xajax_response = new XajaxResponse(); $return = ''; - if (isset($needle) && !empty($type)) { + if (!empty($needle) && !empty($type)) { // xajax send utf8 datas... datas in db can be non-utf8 datas $charset = api_get_system_encoding(); @@ -147,8 +146,7 @@ function search_sessions($needle,$type) { ' LIMIT 11';*/ } else if ($type == 'searchbox') { $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "%$needle%")); - } - else { + } else { $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%")); } $i=0; @@ -270,10 +268,10 @@ if(!empty($errorMsg)) {
- 'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?> + 'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
&letter="+select.options[select.selectedIndex].text, false); xhr_object.open("POST", "loadUsersInSelect.ajax.php"); xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); @@ -400,7 +396,6 @@ function makepost(select){ return ret; } ---> getJavascript('../inc/lib/xajax/'); $htmlHeadXtra[] = '
+ :