From 89694ece65b4e70d8ea8d2f52d8b933d0e6f0fcb Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Wed, 16 May 2018 09:54:35 +0200 Subject: [PATCH] Minor - format code --- main/extra/userInfo.php | 411 +++++++++--------------------- main/extra/userInfoLib.php | 497 ++++++++++++++++--------------------- main/survey/fillsurvey.php | 56 ++--- 3 files changed, 349 insertions(+), 615 deletions(-) diff --git a/main/extra/userInfo.php b/main/extra/userInfo.php index e6faa21a6b..a1e63acd96 100644 --- a/main/extra/userInfo.php +++ b/main/extra/userInfo.php @@ -1,41 +1,21 @@ +$htmlHeadXtra[] = ''; $editMainUserInfo = Security::remove_XSS($_REQUEST['editMainUserInfo']); @@ -51,8 +31,8 @@ if (api_is_anonymous()) { } //prepare variables used in userInfoLib.php functions -$TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); -$TBL_USERINFO_CONTENT = Database :: get_course_table(userinfo_content); +$TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); +$TBL_USERINFO_CONTENT = Database:: get_course_table(userinfo_content); if ($tool_info['visibility'] == 1 ) { $interbreadcrumb[] = array ('url' => 'user.php', 'name' => get_lang('Users')); @@ -67,8 +47,6 @@ if ($origin != 'learnpath') { //so we are not in learnpath tool $currentCourse = api_get_course_id(); $current_session_id = api_get_session_id(); -// api_display_tool_title(get_lang("Users")); - /* * data found in settings are : * $uid @@ -78,9 +56,6 @@ $current_session_id = api_get_session_id(); * $currentCourseID */ -//$userIdViewed = $uInfo; // Id of the user we want to view coming from the user.php - -//get information about one user $userIdViewed = Security::remove_XSS($_REQUEST['uInfo']); /** @@ -90,21 +65,9 @@ $userIdViewed = Security::remove_XSS($_REQUEST['uInfo']); $courseCode = api_get_course_id(); $tbl_coursUser = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $userIdViewer = api_get_user_id(); // id fo the user currently online -//$userIdViewed = $_GET['userIdViewed']; // Id of the user we want to view - $allowedToEditContent = ($userIdViewer == $userIdViewed) || $is_platformAdmin; $allowedToEditDef = api_is_allowed_to_edit(null, true); $is_allowedToTrack = api_is_allowed_to_edit(null, true); - -// Library connection -require_once "userInfoLib.php"; - -/** - * FUNCTIONS - */ - -/* COMMANDS SECTION */ - $displayMode = "viewContentList"; $removeDef = Security::remove_XSS($_GET['removeDef']); $editDef = Security::remove_XSS($_GET['editDef']); @@ -124,7 +87,7 @@ if ($allowedToEditDef) { $displayMode = "viewDefList"; } elseif (!empty($_GET['editDef'])) { $displayMode = "viewDefEdit"; - } elseif (!empty ($_POST['addDef'])) { + } elseif (!empty($_POST['addDef'])) { $displayMode = "viewDefEdit"; } elseif (!empty($_GET['moveUpDef'])) { move_cat_rank($_GET['moveUpDef'], "up"); @@ -138,83 +101,35 @@ if ($allowedToEditDef) { $userIdViewed = strval(intval($_GET['editMainUserInfo'])); $displayMode = "viewMainInfoEdit"; } elseif (!empty($_REQUEST['submitMainUserInfo'])) { - /* - if (isset ($_REQUEST['submitMainUserInfo'])) - { - */ $userIdViewed = strval(intval($_REQUEST['submitMainUserInfo'])); - - /* - //is teacher - $promoteCourseAdmin=$_REQUEST['promoteCourseAdmin']; - $userProperties['status'] = 5; - if ($promoteCourseAdmin) - { - $userProperties['status'] = 1; - } - - // deprecated feature - - // is coach - if (isset ($_REQUEST['promoteTutor'])) - { - $promoteTutor=$_REQUEST['promoteTutor']; - $userProperties['tutor'] = 0; - if ($promoteTutor) - { - $userProperties['tutor'] = 1; - } - } -// role is a string - if (isset ($_REQUEST['role'])) - { - $role=$_REQUEST['role']; - $userProperties['role'] = $role; - } - - //get information about one user - task #3009 -*/ - if ($current_session_id) { - -// $nocoach = isset($_POST['promoteTutor'])?false:true; -// $res = SessionManager::set_coach_to_course_session($userIdViewed, $current_session_id, $courseCode, $nocoach); - } else { - if (!empty($_POST['promoteCourseAdmin']) && $_POST['promoteCourseAdmin']){ + if (!empty($_POST['promoteCourseAdmin']) && $_POST['promoteCourseAdmin']) { $userProperties['status'] = 1; - } else{ + } else { $userProperties['status'] = 5; } - if (!empty($_POST['promoteTutor']) && $_POST['promoteTutor']){ + if (!empty($_POST['promoteTutor']) && $_POST['promoteTutor']) { $userProperties['tutor'] = 1; - } else{ + } else { $userProperties['tutor'] = 0; } - - //$userProperties['role'] = $_POST['role']; - $userhoraire_name = $_POST['hor_name']; - $course_id = $_course['real_id']; - update_user_course_properties($userIdViewed, $courseCode, $userProperties,$userhoraire_name, $course_id); - - } - + $userhoraire_name = $_POST['hor_name']; + $course_id = $_course['real_id']; + update_user_course_properties($userIdViewed, $courseCode, $userProperties, $userhoraire_name, $course_id); + } $displayMode = "viewContentList"; } } -// COMMON COMMANDS - if ($allowedToEditContent) { if (isset($_POST['submitContent'])) { if ($_POST['cntId']) { // submit a content change edit_cat_content($_POST['catId'], $userIdViewed, $_POST['content'], $_SERVER['REMOTE_ADDR']); - - } else { + } else { // submit a totally new content fill_new_cat_content($_POST['catId'], $userIdViewed, $_POST['content'], $_SERVER['REMOTE_ADDR']); - } $displayMode = "viewContentList"; } elseif (!empty($_GET['editContent'])) { @@ -222,38 +137,55 @@ if ($allowedToEditContent) { $userIdViewed = $userIdViewed; } } - -/* DISPLAY MODES */ -// Back button for each display mode (Top) - if (api_is_allowed_to_edit(null, true)) { - echo '
'; - if($origin=='users'){ - echo ''.Display::return_icon('back.png',get_lang('BackUser'),'',ICON_SIZE_MEDIUM).''; - } - else{ - echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; - } - - if (!is_numeric($_GET['editMainUserInfo'])) { - if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') { - echo ''.Display::return_icon('edit.png',get_lang('EditUser'),'',ICON_SIZE_MEDIUM).get_lang('EditUser').''; - } - } else { - if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') { - echo ''.Display::return_icon('user.png',get_lang('ViewUser'),'',ICON_SIZE_MEDIUM).get_lang('ViewUser').''; - } - } - echo ''.Display::return_icon('stats.png',get_lang('UserStatistics'),'',ICON_SIZE_MEDIUM).get_lang('UserStatistics').''; + echo '
'; + if ($origin == 'users') { + echo ''. + Display::return_icon('back.png', get_lang('BackUser'), '', ICON_SIZE_MEDIUM).''; + } else { + echo ''. + Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).''; + } + + if (!is_numeric($_GET['editMainUserInfo'])) { + if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') { + echo ''. + Display::return_icon('edit.png', get_lang('EditUser'), '', ICON_SIZE_MEDIUM).get_lang( + 'EditUser' + ).''; + } + } else { + if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') { + echo ''. + Display::return_icon( + 'user.png', + get_lang('ViewUser'), + '', + ICON_SIZE_MEDIUM + ).get_lang('ViewUser').''; + } + } + echo ''.Display::return_icon('stats.png',get_lang('UserStatistics'),'',ICON_SIZE_MEDIUM).get_lang('UserStatistics').''; echo '
'; } else { - if ($tool_info['visibility'] == 1 ) { + if ($tool_info['visibility'] == 1) { echo '
'; - if($origin=='users'){ - echo ''.Display::return_icon('back.png',get_lang('BackUser'),'',ICON_SIZE_MEDIUM).''; - } - else{ - echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; + if ($origin == 'users') { + echo ''. + Display::return_icon( + 'back.png', + get_lang('BackUser'), + '', + ICON_SIZE_MEDIUM + ).''; + } else { + echo ''.Display::return_icon( + 'back.png', + get_lang('Back'), + '', + ICON_SIZE_MEDIUM + ).''; } echo '
'; } @@ -261,16 +193,19 @@ if (api_is_allowed_to_edit(null, true)) { // get information about user id viewed $user_info_viewed = api_get_user_info($userIdViewed); -$is_session_course_coach = UserManager::is_session_course_coach($userIdViewed, $_course['sysCode'], $current_session_id); +$is_session_course_coach = UserManager::is_session_course_coach( + $userIdViewed, + $_course['sysCode'], + $current_session_id +); if ($displayMode == "viewDefEdit") { /* CATEGORIES DEFINITIONS : EDIT */ - $catToEdit = get_cat_def($_GET['editDef']); $edit_heading_form = new FormValidator('edit_heading_form'); $edit_heading_form->addElement('hidden', 'id'); $edit_heading_form->add_textfield('title', get_lang('Title')); - $edit_heading_form->addElement('textarea', 'comment', get_lang('Comment'), array ('cols' => 60, 'rows' => 4)); + $edit_heading_form->addElement('textarea', 'comment', get_lang('Comment'), array('cols' => 60, 'rows' => 4)); $possible_line_nrs[1] = '1 '.get_lang('Line'); $possible_line_nrs[3] = '3 '.get_lang('Lines'); $possible_line_nrs[5] = '5 '.get_lang('Lines'); @@ -282,23 +217,17 @@ if ($displayMode == "viewDefEdit") { $edit_heading_form->display(); } elseif ($displayMode == "viewDefList") { - /*CATEGORIES DEFINITIONS : LIST */ - $catList = get_cat_def_list(); - if ($catList) { foreach ($catList as $thisCat) { // displays Title and comments echo "

", "".htmlize($thisCat['title'])."
\n", "".htmlize($thisCat['comment'])."\n", "

"; - // displays lines echo "
\n", "\n"; - for ($i = 1; $i <= $thisCat['nbline']; $i ++) { echo "
__________________________________________\n"; } echo "\n", "
\n"; - // displays commands echo "", "\"".get_lang('Remove')."\"", "", "", "\"".get_lang('Edit')."\"", "", "", "\"".get_lang('MoveUp')."\"", "", "", "\"".get_lang('MoveDown')."\"", "\n"; } // end for each @@ -309,10 +238,8 @@ if ($displayMode == "viewDefEdit") { "", "\n", "
\n"; -} -elseif ($displayMode == "viewContentEdit") { +} elseif ($displayMode == 'viewContentEdit') { /* CATEGORIES CONTENTS : EDIT */ - $catToEdit = get_cat_content($userIdViewed, $_GET['editContent']); $content_heading_form = new FormValidator('content_heading_form'); $content_heading_form->addElement('hidden', 'cntId'); @@ -322,7 +249,12 @@ elseif ($displayMode == "viewContentEdit") { if ($catToEdit['nbline'] == 1) { $content_heading_form->addElement('text', 'content', null, array ('size' => 80)); } else { - $content_heading_form->addElement('textarea', 'content', null, array ('cols' => 60, 'rows' => $catToEdit['nbline'])); + $content_heading_form->addElement( + 'textarea', + 'content', + null, + array('cols' => 60, 'rows' => $catToEdit['nbline']) + ); } $content_heading_form->addElement('submit', 'submitContent', get_lang('Ok')); $defaults = $catToEdit; @@ -331,21 +263,10 @@ elseif ($displayMode == "viewContentEdit") { $content_heading_form->setDefaults($defaults); $content_heading_form->display(); } elseif ($displayMode == "viewMainInfoEdit") { - - /* CATEGORIES MAIN INFO : EDIT */ - -// $mainUserInfo = get_main_user_info($userIdViewed, $courseCode); - $mainUserInfo = api_get_user_info($userIdViewed); + $mainUserInfo = api_get_user_info($userIdViewed); if ($mainUserInfo) { ($mainUserInfo['status'] == COURSEMANAGER) ? $courseAdminChecked = "checked" : $courseAdminChecked = ""; - - if ($current_session_id) { -// ($is_session_course_coach)? $tutorChecked = "checked" : $tutorChecked = ""; - } else { -// ($mainUserInfo['tutor_id'] == 1) ? $tutorChecked = "checked" : $tutorChecked = ""; - } - - $image_array=UserManager::get_user_picture_path_by_id($userIdViewed,'web',false,true); + $image_array = UserManager::get_user_picture_path_by_id($userIdViewed, 'web', false, true); // get the path,width and height from original picture $big_image = $image_array['dir'].'big_'.$image_array['file']; $big_image_size = api_getimagesize($big_image); @@ -365,69 +286,35 @@ elseif ($displayMode == "viewContentEdit") { "\n", "", get_lang('Name'), "\n", "", get_lang('Horaire'), "\n"; - if ($current_session_id) { - if ($user_info_viewed['status'] == COURSEMANAGER) { - //echo "", get_lang('Tutor'), "\n"; - } - } else { - if ($user_info_viewed['status'] == STUDENT) { - //echo "", get_lang('CourseAssistant'), "\n"; - } else { - //echo "", get_lang('CourseManager'), "\n"; - } - } echo "\n", "", "", htmlize(api_get_person_name($mainUserInfo['firstName'], $mainUserInfo['lastName'])), "\n", - //"", - "", $mainUserInfo['official_code'], "" ; -$course_id = $_course['real_id']; -//$course_id = $c_id; -//récupérer horaire de l'élève - ?> - - - + where c_id = $course_id "; + $result2 = Database::query($sql); + while ($row = Database::fetch_array( $result2)) { + $horaire_name = $row["name"]; ?> + - - -

'; - - if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed)) { - if ($current_session_id) { - if ($user_info_viewed['status'] == COURSEMANAGER) { - // echo ""; - } - } else { - if ($user_info_viewed['status'] == STUDENT) { - // echo "" . ' ' . Display::return_icon('synthese_view.gif',get_lang('TheTutorOnlyCanKeepTrackOfStudentsRegisteredInTheCourse')),$checked,""; - } else { - // echo "" . ' ' . Display::return_icon('synthese_view.gif',get_lang('TheTeacherCanQualifyEvaluateAndKeepTrackOfAllStudentsEnrolledInTheCourse')),$checked,"\n"; - } } + ?> + +

'; + if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed)) { } else { echo "", get_lang('CourseManager'), "\n"; - - } - - echo "\n", "", "", "\n"; - if (api_get_setting('show_email_addresses') == 'true') { - echo "

".Display :: encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."

"; + echo "

".Display:: encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."

"; } if (api_get_setting('extended_profile') == 'true') { @@ -450,14 +337,11 @@ $course_id = $_course['real_id']; $virtual_course_code = $_GET["virtual_course"]; if (isset ($virtual_course_code)) { $courseCode = $virtual_course_code; - //not supported yet: editing users of virtual courses $allowedToEditDef = false; } - -// $mainUserInfo = get_main_user_info($userIdViewed, $courseCode); $mainUserInfo = api_get_user_info($userIdViewed); if ($mainUserInfo) { - $image_array=UserManager::get_user_picture_path_by_id($userIdViewed,'web',false,true); + $image_array = UserManager::get_user_picture_path_by_id($userIdViewed, 'web', false, true); // get the path,width and height from original picture $big_image = $image_array['dir'].'big_'.$image_array['file']; $big_image_size = api_getimagesize($big_image); @@ -474,80 +358,41 @@ $course_id = $_course['real_id']; // is the user online? $online =''; if (user_is_online($userIdViewed)) { - $online = Display::return_icon('online.gif', get_lang('OnLine'),array('style'=>'with="8"; height="8"')); + $online = Display::return_icon('online.gif', get_lang('OnLine'), array('style' => 'with="8"; height="8"')); } - //DISPLAY TABLE HEADING - if ($origin == 'learnpath') { $allowedToEditDef=false; $is_allowedToTrack=false; } - - //"",get_lang('Tutor'),"\n", - echo "", + // DISPLAY TABLE HEADING + if ($origin == 'learnpath') { + $allowedToEditDef = false; + $is_allowedToTrack = false; + } + echo "
", "\n", "\n", "\n", "\n"; - if ($current_session_id) { - if ($user_info_viewed['status'] == COURSEMANAGER) { - // echo "\n"; - } - } else { - if ($user_info_viewed['status'] == STUDENT) { - // echo "\n"; - } else { - // echo "\n"; - } - } - //echo ($allowedToEditDef && api_get_setting('allow_user_course_subscription_by_course_admin') == 'true'?"\n":""); - //echo ($is_allowedToTrack?"\n":""); - - echo "\n", + echo "\n", "\n", - "\n", - // "", ""; - //DISPLAY TABLE CONTENT - + // DISPLAY TABLE CONTENT if ($current_session_id) { if ($user_info_viewed['status'] == COURSEMANAGER) { -// if ($is_session_course_coach) { -// echo "\n"; -// } else { - echo "\n"; -// } + echo "\n"; } } else { if ($user_info_viewed['status'] == STUDENT) { - // if ($mainUserInfo['tutor_id'] == 1) { - // echo "\n"; - // } else { - echo "\n"; - // } + echo "\n"; } else { - // if ($mainUserInfo['status'] == 1) { - // echo ""; - // } else { - echo "\n"; - // } + echo "\n"; } } - if ($allowedToEditDef && api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') { - //echo ""; - } - if ($is_allowedToTrack) { - //echo ""; - } echo "
".get_lang('Name')."".get_lang('Description')."", get_lang('OfficialCode'), "".get_lang('Tutor')."".get_lang('Tutor')."".get_lang('CourseManager')."".get_lang('Edit')."".get_lang('Tracking')."
".$online.' '.htmlize(api_get_person_name($mainUserInfo['firstName'], $mainUserInfo['lastName']))."".htmlize($mainUserInfo['role'])."", $mainUserInfo['official_code'], "",get_lang('Tutor')," - - ",get_lang('Tutor')," - - ",get_lang('CourseManager')," - - "; - //echo "\"\""; - //echo ""; - //echo "\"".get_lang('Tracking').""; - //echo "
"; - if (api_get_setting("show_email_addresses") == "true") { - echo "

". Display::encrypted_mailto_link($mainUserInfo['email'],$mainUserInfo['email']). "

"; + echo "

".Display::encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."

"; } if (api_get_setting('extended_profile') == 'true') { @@ -563,12 +408,12 @@ $course_id = $_course['real_id']; echo '
'.get_lang('MyProductions').'
'.UserManager::build_production_list($mainUserInfo['user_id']).'
'; } } else { - Display :: display_normal_message(get_lang('ThisStudentIsSubscribeThroughASession')); + Display::display_normal_message(get_lang('ThisStudentIsSubscribeThroughASession')); } - if (api_get_setting('allow_user_headings') == 'true' && $allowedToEditDef) // only course administrators see this line - { - echo "
", + if (api_get_setting('allow_user_headings') == 'true' && $allowedToEditDef) { + // only course administrators see this line + echo "
", "
", get_lang('CourseAdministratorOnly')," : ", "", @@ -578,44 +423,28 @@ $course_id = $_course['real_id']; } $catList = get_course_user_info($userIdViewed); - - if ($catList) - { - foreach ($catList as $thisCat) - { + if ($catList) { + foreach ($catList as $thisCat) { // Category title - - echo "

",$thisCat['title'],"

\n"; - + echo "

", $thisCat['title'], "

\n"; // Category content - - echo "
\n"; - - if ($thisCat['content']) - { + echo "
\n"; + if ($thisCat['content']) { echo htmlize($thisCat['content'])."\n"; - } - else - { + } else { echo "...."; } - // Edit command - - if ($allowedToEditContent) - { - echo "

\n", - "", + if ($allowedToEditContent) { + echo "

\n", + "", "\"edit\"", "\n"; } - - echo "
\n"; + echo "
\n"; } } } -// Back button for each display mode (bottom) -//echo "
".get_lang('BackUser')."
\n"; -/* FOOTER */ -Display :: display_footer(); +Display::display_footer(); diff --git a/main/extra/userInfoLib.php b/main/extra/userInfoLib.php index 2d4aa58f36..f7bf4fdbfb 100644 --- a/main/extra/userInfoLib.php +++ b/main/extra/userInfoLib.php @@ -1,22 +1,19 @@ * @author - Christophe Gesch� - * @param - string $title - category title - * @param - string $comment - title comment - * @param - int$nbline - lines number for the field the user will fill. - * @return - bollean true if succeed, else bolean false + * + * @param string $title - category title + * @param string $comment - title comment + * @param int $nbline - lines number for the field the user will fill. + * + * @return boolean true if succeed, else bolean false */ - -function create_cat_def($title="", $comment="", $nbline="5") +function create_cat_def($title = "", $comment = "", $nbline = "5") { global $TBL_USERINFO_DEF; //taken from userInfo.php @@ -24,17 +21,17 @@ function create_cat_def($title="", $comment="", $nbline="5") $comment = Database::escape_string(trim($comment)); $nbline = strval(intval($nbline)); - if ( 0 == (int) $nbline || empty($title)) - { + if (0 == (int)$nbline || empty($title)) { return false; } $sql = "SELECT MAX(rank) as maxRank FROM ".$TBL_USERINFO_DEF; $result = Database::query($sql); - if ($result) $maxRank = Database::fetch_array($result); + if ($result) { + $maxRank = Database::fetch_array($result); + } $maxRank = $maxRank['maxRank']; - $thisRank = $maxRank + 1; $sql = "INSERT INTO $TBL_USERINFO_DEF SET @@ -53,10 +50,12 @@ function create_cat_def($title="", $comment="", $nbline="5") * * @author - Hugues peeters * @author - Christophe Gesch� - * @param - int $id - id of the category - * @param - string $title - category title - * @param - string $comment - title comment - * @param - int$nbline - lines number for the field the user will fill. + * + * @param int $id - id of the category + * @param string $title - category title + * @param string $comment - title comment + * @param int $nbline - lines number for the field the user will fill. + * * @return - boolean true if succeed, else otherwise */ @@ -64,12 +63,11 @@ function edit_cat_def($id, $title, $comment, $nbline) { global $TBL_USERINFO_DEF; - if ( 0 == $nbline || 0 == $id ) - { + if (0 == $nbline || 0 == $id) { return false; } $id = strval(intval($id)); //make sure id is integer - $title = Database::escape_string(trim($title)); + $title = Database::escape_string(trim($title)); $comment = Database::escape_string(trim($comment)); $nbline = strval(intval($nbline)); @@ -89,34 +87,32 @@ function edit_cat_def($id, $title, $comment, $nbline) * @author - Hugues peeters * @author - Christophe Gesche * - * @param - int $id - id of the category - * or "ALL" for all category - * @param - boolean $force - FALSE (default) : prevents removal if users have + * @param int $id - id of the category + * or "ALL" for all category + * @param boolean $force - FALSE (default) : prevents removal if users have * already fill this category * TRUE : bypass user content existence check - * @param - int $nbline - lines number for the field the user will fill. - * @return - bollean - TRUE if succeed, ELSE otherwise + * @param int $nbline - lines number for the field the user will fill. + * + * @return boolean - TRUE if succeed, ELSE otherwise */ function remove_cat_def($id, $force = false) { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); - $TBL_USERINFO_CONTENT = Database :: get_course_table(userinfo_content); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); + $TBL_USERINFO_CONTENT = Database:: get_course_table(userinfo_content); $id = strval(intval($id)); - if ( (0 == (int) $id || $id == "ALL") || ! is_bool($force)) - { + if ((0 == (int)$id || $id == "ALL") || !is_bool($force)) { return false; } $sqlCondition = " WHERE id = '$id'"; - if (!$force) - { + if (!$force) { $sql = "SELECT * FROM $TBL_USERINFO_CONTENT $sqlCondition"; $result = Database::query($sql); - if ( Database::num_rows($result) > 0) - { + if (Database::num_rows($result) > 0) { return false; } } @@ -130,29 +126,26 @@ function remove_cat_def($id, $force = false) * @author - Hugues peeters * @author - Christophe Gesch� * - * @param - int $id - id of the category - * @param - direction "up" or "down" : - * "up" decrease the rank of gived $id by switching rank with the just lower - * "down" increase the rank of gived $id by switching rank with the just upper + * @param int $id - id of the category + * @param string $direction "up" or "down" : + * "up" decrease the rank of gived $id by switching rank with the just lower + * "down" increase the rank of gived $id by switching rank with the just upper * - * @return - boolean true if succeed, else bolean false + * @return boolean true if succeed, else boolean false */ - function move_cat_rank($id, $direction) // up & down. { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); $id = strval(intval($id)); - if ( 0 == (int) $id || ! ($direction == "up" || $direction == "down") ) - { + if (0 == (int)$id || !($direction == "up" || $direction == "down")) { return false; } $sql = "SELECT rank FROM $TBL_USERINFO_DEF WHERE id = '$id'"; $result = Database::query($sql); - if (Database::num_rows($result) < 1) - { + if (Database::num_rows($result) < 1) { return false; } @@ -167,42 +160,39 @@ function move_cat_rank($id, $direction) // up & down. * @author - Hugues peeters * @author - Christophe Gesche * - * @param - int $rank - actual rank of the category - * @param - direction "up" or "down" : - * "up" decrease the rank of gived $rank by switching rank with the just lower - * "down" increase the rank of gived $rank by switching rank with the just upper + * @param int $rank - actual rank of the category + * @param string $direction "up" or "down" : + * "up" decrease the rank of gived $rank by switching rank with the just lower + * "down" increase the rank of gived $rank by switching rank with the just upper * - * @return - boolean true if succeed, else bolean false + * @return boolean true if succeed, else boolean false */ - function move_cat_rank_by_rank($rank, $direction) // up & down. { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); - if ( 0 == (int) $rank || ! ($direction == "up" || $direction == "down") ) - { + if (0 == (int)$rank || !($direction == "up" || $direction == "down")) { return false; } - if ($direction == "down") // thus increase rank ... - { + if ($direction == "down") { + // thus increase rank ... $sort = "ASC"; $compOp = ">="; - } - else // thus decrease rank ... - { + } else { + // thus decrease rank ... $sort = "DESC"; $compOp = "<="; } // this request find the 2 line to be switched (on rank value) - $sql = "SELECT id, rank FROM ".$TBL_USERINFO_DEF." WHERE rank $compOp $rank - ORDER BY rank $sort LIMIT 2"; + $sql = "SELECT id, rank FROM ".$TBL_USERINFO_DEF." + WHERE rank $compOp $rank + ORDER BY rank $sort LIMIT 2"; $result = Database::query($sql); - if (Database::num_rows($result) < 2) - { + if (Database::num_rows($result) < 2) { return false; } @@ -210,9 +200,9 @@ function move_cat_rank_by_rank($rank, $direction) // up & down. $nextCat = Database::fetch_array($result); $sql1 = "UPDATE ".$TBL_USERINFO_DEF." SET rank ='".$nextCat['rank']. - "' WHERE id = '".$thisCat['id']."'"; + "' WHERE id = '".$thisCat['id']."'"; $sql2 = "UPDATE ".$TBL_USERINFO_DEF." SET rank ='".$thisCat['rank']. - "' WHERE id = '".$nextCat['id']."'"; + "' WHERE id = '".$nextCat['id']."'"; Database::query($sql1); Database::query($sql2); @@ -220,185 +210,131 @@ function move_cat_rank_by_rank($rank, $direction) // up & down. return true; } - /** * @author Hugues Peeters - peeters@ipm.ucl.ac.be - * @param int $user_id - * @param string $course_code - * @param array $properties - should contain 'role', 'status', 'tutor_id' + * + * @param int $user_id + * @param string $course_code + * @param array $properties - should contain 'role', 'status', 'tutor_id' + * * @return boolean true if succeed false otherwise */ - function update_user_course_properties($user_id, $course_code, $properties, $horaire_name, $course_id) { global $tbl_coursUser,$_user; $sqlChangeStatus = ""; $user_id = strval(intval($user_id));//filter integer $course_code = Database::escape_string($course_code); - if ($user_id != $_user['user_id']) - { + if ($user_id != $_user['user_id']) { $sqlChangeStatus = "status = '".Database::escape_string($properties['status'])."',"; } - //feature deprecated tutor_id = '".Database::escape_string($properties['tutor'])."' - $sql = "UPDATE $tbl_coursUser - SET ".$sqlChangeStatus." + $sql = "UPDATE $tbl_coursUser + SET ".$sqlChangeStatus." is_tutor = '".Database::escape_string($properties['tutor'])."' - WHERE user_id = '".$user_id."' - AND c_id = '".$course_id."'"; - $result = Database::query($sql); - //update official-code: Horaire + WHERE + user_id = '".$user_id."' AND + c_id = '".$course_id."'"; + Database::query($sql); + //update official-code: Horaire $table_user = Database::get_main_table(TABLE_MAIN_USER); - $sql2 = "UPDATE $table_user - SET official_code = '".$horaire_name."' - WHERE user_id = '".$user_id."' - "; - - $result2 = api_sql_query($sql2,__FILE__,__LINE__); - -//on récupère l'horaire - -$tbl_personal_agenda = Database :: get_main_table(TABLE_PERSONAL_AGENDA); -$TABLECALDATES = Database :: get_course_table(cal_dates); -$jour= 0 ; - $sql3 = "SELECT date FROM $TABLECALDATES - WHERE horaire_name = '".$horaire_name."' AND status = 'C' - AND c_id = '".$course_id."' - ORDER BY date - "; - - $result3 = api_sql_query($sql3,__FILE__,__LINE__); + $sql2 = "UPDATE $table_user + SET official_code = '".$horaire_name."' + WHERE user_id = '".$user_id."'"; + Database::query($sql2); + //on récupère l'horaire + $tbl_personal_agenda = Database:: get_main_table(TABLE_PERSONAL_AGENDA); + $TABLECALDATES = Database:: get_course_table(cal_dates); + $jour = 0; + $sql3 = "SELECT date FROM $TABLECALDATES + WHERE + horaire_name = '".$horaire_name."' AND + status = 'C' AND + c_id = '".$course_id."' + ORDER BY date "; + $result3 = Database::query($sql3); + + if (Database::num_rows($result3) == '0') { + return false; + } - if (Database::num_rows($result3) == '0') - { - return false; - } //on efface ce qui est déjà inscrit - -$sql4 = "DELETE FROM ".$tbl_personal_agenda." + $sql4 = "DELETE FROM ".$tbl_personal_agenda." WHERE user = '".$user_id."' - AND text = 'Pour le calendrier, ne pas effacer' - - "; -api_sql_query($sql4,__FILE__,__LINE__); - -$sql = "DELETE FROM ".$tbl_personal_agenda." - WHERE user = '".$user_id."' AND title = 'Examen*' - "; -api_sql_query($sql,__FILE__,__LINE__); - //à chaque date dans l'horaire - while($res3 = Database::fetch_array($result3)) { - $date=$res3['date']; - -//on incrémente les jours de cours -$date = api_get_utc_datetime($date); - -$jour= $jour+1; -//on réinsère le nouvel horaire -$sql = "INSERT ".$tbl_personal_agenda." (user,title,text,date) - VALUES ('".$user_id."','".$jour."','Pour le calendrier, ne pas effacer','".$date."') - "; - api_sql_query($sql,__FILE__,__LINE__); - - // pour les inscrire examens dans agenda - - $sql5 = "SELECT date FROM $TABLECALDATES + AND text = 'Pour le calendrier, ne pas effacer'"; + Database::query($sql4); + + $sql = "DELETE FROM ".$tbl_personal_agenda." + WHERE user = '".$user_id."' AND title = 'Examen*'"; + Database::query($sql); + //à chaque date dans l'horaire + while ($res3 = Database::fetch_array($result3)) { + $date = $res3['date']; + //on incrémente les jours de cours + $date = api_get_utc_datetime($date); + $jour = $jour + 1; + //on réinsère le nouvel horaire + $sql = "INSERT ".$tbl_personal_agenda." (user,title,text,date) + VALUES ('".$user_id."','".$jour."','Pour le calendrier, ne pas effacer','".$date."')"; + Database::query($sql); + // pour les inscrire examens dans agenda + $sql5 = "SELECT date FROM $TABLECALDATES WHERE horaire_name = '".$horaire_name."' AND status = 'E' AND c_id = '".$course_id."' ORDER BY date "; - - $result5 = api_sql_query($sql5,__FILE__,__LINE__); - - } - -//à chaque date dans l'horaire - while($res5 = Database::fetch_array($result5)) { - $date=$res5['date']; -$date = api_get_utc_datetime($date); - -//on réinsère le nouvel horaire -$sql7 = "INSERT ".$tbl_personal_agenda." (user,title,date) - VALUES ('".$user_id."','Examen*','".$date."') - "; - api_sql_query($sql7,__FILE__,__LINE__); - } - -// fin horaire - - ///// Francois Belisle Kezber - // The only calling location does not process a result, so there is no need to return a value - // Moreover, the Database:affectedrows() needs a parameter to work properly. - // The code used to crash here because of the Database::affected_rows() call - - /* - if (Database::affected_rows() > 0) - { - die('TRUE'); - return true; + $result5 = Database::query($sql5); } - else - { - die('FALSE'); - return false; - }*/ + //à chaque date dans l'horaire + while ($res5 = Database::fetch_array($result5)) { + $date = $res5['date']; + $date = api_get_utc_datetime($date); + //on réinsère le nouvel horaire + $sql7 = "INSERT ".$tbl_personal_agenda." (user,title,date) VALUES ('".$user_id."','Examen*','".$date."')"; + Database::query($sql7); + } } - - - - -/*---------------------------------------- - CATEGORIES CONTENT TREATMENT - --------------------------------------*/ - - - - - /** * fill a bloc for information category * * @author - Hugues peeters * @author - Christophe Gesche - * @param - $definition_id, - * @param - $user_id, - * @param - $user_ip, - * @param - $content - * @return - boolean true if succeed, else bolean false + * + * @param $definition_id + * @param $user_id + * @param $user_ip + * @param $content + * + * @return boolean true if succeed, else boolean false */ - -function fill_new_cat_content($definition_id, $user_id, $content="", $user_ip="") +function fill_new_cat_content($definition_id, $user_id, $content = "", $user_ip = "") { global $TBL_USERINFO_CONTENT; - if (empty($user_ip)) - { + if (empty($user_ip)) { $user_ip = $_SERVER['REMOTE_ADDR']; } - $definition_id = strval(intval($definition_id)); - $user_id = strval(intval($user_id)); - $content = Database::escape_string(trim($content)); - $user_ip = Database::escape_string(trim($user_ip)); + $definition_id = strval(intval($definition_id)); + $user_id = strval(intval($user_id)); + $content = Database::escape_string(trim($content)); + $user_ip = Database::escape_string(trim($user_ip)); - if ( 0 == $definition_id || 0 == $user_id || $content == "") - { + if (0 == $definition_id || 0 == $user_id || $content == "") { // Here we should introduce an error handling system... return false; } // Do not create if already exist - $sql = "SELECT id FROM ".$TBL_USERINFO_CONTENT." WHERE definition_id = '$definition_id' AND user_id = '$user_id'"; $result = Database::query($sql); - if (Database::num_rows($result) > 0) - { + if (Database::num_rows($result) > 0) { return false; } @@ -418,36 +354,34 @@ function fill_new_cat_content($definition_id, $user_id, $content="", $user_ip="" * * @author - Hugues peeters * @author - Christophe Gesche - * @param - $definition_id, - * @param - $user_id, - * @param - $user_ip, DEFAULT $REMOTE_ADDR - * @param - $content ; if empty call delete the bloc - * @return - boolean true if succeed, else bolean false + * + * @param $definition_id + * @param $user_id + * @param $user_ip DEFAULT $REMOTE_ADDR + * @param $content if empty call delete the bloc + * + * @return boolean true if succeed, else boolean false */ -function edit_cat_content($definition_id, $user_id, $content ="", $user_ip="") +function edit_cat_content($definition_id, $user_id, $content = "", $user_ip = "") { global $TBL_USERINFO_CONTENT; - $definition_id = strval(intval($definition_id)); - $user_id = strval(intval($user_id)); - $content = Database::escape_string(trim($content)); - if (empty($user_ip)) - { + $definition_id = strval(intval($definition_id)); + $user_id = strval(intval($user_id)); + $content = Database::escape_string(trim($content)); + if (empty($user_ip)) { $user_ip = $_SERVER['REMOTE_ADDR']; } $user_ip = Database::escape_string($user_ip); - if (0 == $user_id || 0 == $definition_id) - { + if (0 == $user_id || 0 == $definition_id) { return false; } - if ( $content == "") - { + if ($content == "") { return cleanout_cat_content($user_id, $definition_id); } - - $sql= "UPDATE ".$TBL_USERINFO_CONTENT." SET + $sql = "UPDATE ".$TBL_USERINFO_CONTENT." SET content = '$content', editor_ip = '$user_ip', edition_time = now() @@ -461,21 +395,21 @@ function edit_cat_content($definition_id, $user_id, $content ="", $user_ip="") /** * clean the content of a bloc for information category * - * @author - Hugues peeters - * @author - Christophe Gesche - * @param - $definition_id, - * @param - $user_id - * @return - boolean true if succeed, else bolean false + * @author Hugues peeters + * @author Christophe Gesche + * + * @param $definition_id + * @param $user_id + * + * @return boolean true if succeed, else boolean false */ - function cleanout_cat_content($user_id, $definition_id) { global $TBL_USERINFO_CONTENT; - $user_id = strval(intval($user_id)); - $definition_id = strval(intval($definition_id)); + $user_id = strval(intval($user_id)); + $definition_id = strval(intval($definition_id)); - if (0 == $user_id || 0 == $definition_id) - { + if (0 == $user_id || 0 == $definition_id) { return false; } @@ -487,26 +421,20 @@ function cleanout_cat_content($user_id, $definition_id) return true; } - - -/*---------------------------------------- - SHOW USER INFORMATION TREATMENT - --------------------------------------*/ - /** * get the user info from the user id * @author - Hugues Peeters * @author - Christophe Gesche - * @param - int $user_id user id as stored in the Dokeos main db - * @return - array containg user info sort by categories rank + * + * @param int $user_id user id as stored in the Dokeos main db + * + * @return array containg user info sort by categories rank * each rank contains 'title', 'comment', 'content', 'cat_id' */ - - function get_course_user_info($user_id) { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); - $TBL_USERINFO_CONTENT = Database :: get_course_table(userinfo_content); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); + $TBL_USERINFO_CONTENT = Database:: get_course_table(userinfo_content); $sql = "SELECT cat.id catId, cat.title, cat.comment , content.content @@ -516,11 +444,9 @@ function get_course_user_info($user_id) $result = Database::query($sql); - if (Database::num_rows($result) > 0) - { - while ($userInfo = Database::fetch_array($result, 'ASSOC')) - { - $userInfos[]=$userInfo; + if (Database::num_rows($result) > 0) { + while ($userInfo = Database::fetch_array($result, 'ASSOC')) { + $userInfos[] = $userInfo; } return $userInfos; @@ -529,27 +455,23 @@ function get_course_user_info($user_id) return false; } - - /** * get the main user information * @author - Hugues Peeters * @author - Christophe Gesche - * @param - int $user_id user id as stored in the Dokeos main db - * @return - array containing user info as 'lastName', 'firstName' - * 'email', 'role' + * + * @param int $user_id user id as stored in the Dokeos main db + * + * @return array containing user info as 'lastName', 'firstName', 'email', 'role' */ - function get_main_user_info($user_id, $courseCode) { - $user_id = strval(intval($user_id)); + $user_id = strval(intval($user_id)); $courseCode = Database::escape_string($courseCode); - if (0 == $user_id) - { + if (0 == $user_id) { return false; } - $table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); $table_user = Database::get_main_table(TABLE_MAIN_USER); $sql = "SELECT u.*, u.lastname lastName, u.firstname firstName, @@ -562,36 +484,33 @@ function get_main_user_info($user_id, $courseCode) $result = Database::query($sql); - if (Database::num_rows($result) > 0) - { + if (Database::num_rows($result) > 0) { $userInfo = Database::fetch_array($result, 'ASSOC'); - $userInfo['password']=''; + $userInfo['password'] = ''; + return $userInfo; } return false; } - - - /** * get the user content of a categories plus the categories definition * @author - Hugues Peeters * @author - Christophe Gesche - * @param - int $userId - id of the user - * @param - int $catId - id of the categories - * @return - array containing 'catId', 'title', 'comment', - * 'nbline', 'contentId' and 'content' + * + * @param int $userId id of the user + * @param int $catId id of the categories + * + * @return array containing 'catId', 'title', 'comment', 'nbline', 'contentId' and 'content' */ - function get_cat_content($userId, $catId) { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); - $TBL_USERINFO_CONTENT = Database :: get_course_table(userinfo_content); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); + $TBL_USERINFO_CONTENT = Database:: get_course_table(userinfo_content); $userId = strval(intval($userId)); - $catId = strval(intval($catId)); + $catId = strval(intval($catId)); $sql = "SELECT cat.id catId, cat.title, cat.comment , cat.line_count, content.id contentId, content.content @@ -601,57 +520,57 @@ function get_cat_content($userId, $catId) WHERE cat.id = '$catId' "; $result = Database::query($sql); - if (Database::num_rows($result) > 0) - { + if (Database::num_rows($result) > 0) { $catContent = Database::fetch_array($result, 'ASSOC'); $catContent['nbline'] = $catContent['line_count']; + return $catContent; } return false; } - /** * get the definition of a category * - * @author - Christophe Gesche - * @author - Hugues Peeters - * @param - int $catId - id of the categories - * @return - array containing 'id', 'title', 'comment', and 'nbline', + * @author Christophe Gesche + * @author Hugues Peeters + * + * @param int $catId - id of the categories + * + * @return array containing 'id', 'title', 'comment', and 'nbline', */ function get_cat_def($catId) { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); $catId = strval(intval($catId)); $sql = "SELECT id, title, comment, line_count, rank FROM ".$TBL_USERINFO_DEF." WHERE id = '$catId'"; $result = Database::query($sql); - if (Database::num_rows($result) > 0) - { + if (Database::num_rows($result) > 0) { $catDef = Database::fetch_array($result, 'ASSOC'); $catDef['nbline'] = $catDef['line_count']; + return $catDef; } return false; } - /** * get list of all this course categories * - * @author - Christophe Gesche - * @author - Hugues Peeters - * @return - array containing a list of arrays. + * @author Christophe Gesche + * @author Hugues Peeters + * @return array containing a list of arrays. * And each of these arrays contains * 'catId', 'title', 'comment', and 'nbline', */ function get_cat_def_list() { - $TBL_USERINFO_DEF = Database :: get_course_table(userinfo_def); + $TBL_USERINFO_DEF = Database:: get_course_table(userinfo_def); $sql = "SELECT id catId, title, comment , line_count FROM ".$TBL_USERINFO_DEF." @@ -659,11 +578,9 @@ function get_cat_def_list() $result = Database::query($sql); - if (Database::num_rows($result) > 0) - { - while ($cat_def = Database::fetch_array($result, 'ASSOC')) - { - $cat_def_list[]=$cat_def; + if (Database::num_rows($result) > 0) { + while ($cat_def = Database::fetch_array($result, 'ASSOC')) { + $cat_def_list[] = $cat_def; } return $cat_def_list; @@ -674,13 +591,15 @@ function get_cat_def_list() /** * transform content in a html display - * @author - Hugues Peeters - * @param - string $string string to htmlize - * @ return - string htmlized + * @author Hugues Peeters + * + * @param string $string string to htmlize + * + * @return string htmlized */ - -function htmlize($phrase) +function htmlize($string) { global $charset; - return nl2br(htmlspecialchars($phrase,ENT_QUOTES,$charset)); -} \ No newline at end of file + + return nl2br(htmlspecialchars($string, ENT_QUOTES, $charset)); +} diff --git a/main/survey/fillsurvey.php b/main/survey/fillsurvey.php index 47c90c2bb1..e2bc716f40 100755 --- a/main/survey/fillsurvey.php +++ b/main/survey/fillsurvey.php @@ -504,7 +504,8 @@ if ($survey_data['form_fields'] != '' && $returnParams = $extraField->addElements($form, api_get_user_id()); $jquery_ready_content = $returnParams['jquery_ready_content']; - // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function + // the $jquery_ready_content variable collects all functions + // that will be load in the $(document).ready javascript function $htmlHeadXtra[] = '