From 13e657ef32d1de6d2e9f5c12d2e314a66c954c99 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 18 Dec 2014 13:03:49 +0100 Subject: [PATCH] Minor - format code. --- main/inc/lib/course_home.lib.php | 26 +++++++++++++++++--------- main/survey/survey.lib.php | 26 ++++++++++++++++---------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php index ffa0bcc139..4903db189a 100755 --- a/main/inc/lib/course_home.lib.php +++ b/main/inc/lib/course_home.lib.php @@ -649,7 +649,7 @@ class CourseHome */ public static function show_tools_category($all_tools_list, $rows = false) { - global $_user; + $_user = api_get_user_info(); $theme = api_get_setting('homepage_view'); if ($theme == 'vertical_activity') { //ordering by get_lang name @@ -786,28 +786,36 @@ class CourseHome //$tool['link'] = htmlspecialchars($tool['link']) ; //@todo this visio stuff should be removed if (strpos($tool['name'], 'visio_') !== false) { - $tool_link_params = array('id' => 'tooldesc_'.$tool["id"], + $tool_link_params = array( + 'id' => 'tooldesc_'.$tool["id"], 'href' => '"javascript: void(0);"', 'class' => $class, 'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', - 'target' => $tool['target']); + 'target' => $tool['target'] + ); } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) { - $tool_link_params = array('id' => 'tooldesc_'.$tool["id"], + $tool_link_params = array( + 'id' => 'tooldesc_'.$tool["id"], 'class' => $class, 'href' => 'javascript: void(0);', 'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', //Chat Open Windows - 'target' => $tool['target']); + 'target' => $tool['target'] + ); } else { if (count(explode('type=classroom', $tool['link'])) == 2 || count(explode('type=conference', $tool['link'])) == 2) { - $tool_link_params = array('id' => 'tooldesc_'.$tool["id"], + $tool_link_params = array( + 'id' => 'tooldesc_'.$tool["id"], 'href' => $tool['link'], 'class' => $class, - 'target' => '_blank'); + 'target' => '_blank' + ); } else { - $tool_link_params = array('id' => 'tooldesc_'.$tool["id"], + $tool_link_params = array( + 'id' => 'tooldesc_'.$tool["id"], 'href' => $tool['link'], 'class' => $class, - 'target' => $tool['target']); + 'target' => $tool['target'] + ); } } diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php index 2641a25e92..963e836043 100755 --- a/main/survey/survey.lib.php +++ b/main/survey/survey.lib.php @@ -27,6 +27,7 @@ class survey_manager { /** * @param $code + * * @return string */ public static function generate_unique_code($code) @@ -56,6 +57,7 @@ class survey_manager /** * Deletes all survey invitations of a user * @param int $user_id + * * @return boolean * @assert ('') === false */ @@ -72,15 +74,15 @@ class survey_manager $sql = "SELECT survey_invitation_id, survey_code FROM $table_survey_invitation WHERE user = '$user_id' AND c_id <> 0 "; $result = Database::query($sql); - $deleted = array(); while ($row = Database::fetch_array($result ,'ASSOC')){ $survey_invitation_id = $row['survey_invitation_id']; $survey_code = $row['survey_code']; $sql2 = "DELETE FROM $table_survey_invitation WHERE survey_invitation_id = '$survey_invitation_id' AND c_id <> 0"; if (Database::query($sql2)) { - $sql3 = "UPDATE $table_survey SET invited = invited-1 ". - " WHERE c_id <> 0 AND code ='$survey_code'"; + $sql3 = "UPDATE $table_survey SET + invited = invited-1 + WHERE c_id <> 0 AND code ='$survey_code'"; Database::query($sql3); } } @@ -88,8 +90,8 @@ class survey_manager /** * - * @param type $course_code - * @param type $session_id + * @param string $course_code + * @param int $session_id * @return type * @assert ('') === false */ @@ -102,7 +104,8 @@ class survey_manager $course_info = api_get_course_info($course_code); $session_condition = api_get_session_condition($session_id, true, true); - $sql = "SELECT * FROM $table_survey WHERE c_id = {$course_info['real_id']} $session_condition "; + $sql = "SELECT * FROM $table_survey + WHERE c_id = {$course_info['real_id']} $session_condition "; $result = Database::query($sql); $result = Database::store_result($result, 'ASSOC'); return $result; @@ -182,6 +185,7 @@ class survey_manager * This function stores a survey in the database. * * @param array $values + * * @return array $return the type of return message that has to be displayed and the message in it * * @author Patrick Cool , Ghent University @@ -214,7 +218,6 @@ class survey_manager } $values['anonymous'] = intval($values['anonymous']); - $additional['columns'] = ''; $additional['values'] = ''; @@ -267,11 +270,13 @@ class survey_manager // Logic for versioning surveys if (!empty($values['parent_id'])) { $additional['columns'] .= ', survey_version'; - $sql = 'SELECT survey_version FROM '.$table_survey.' + $sql = 'SELECT survey_version + FROM '.$table_survey.' WHERE c_id = '.$course_id.' AND parent_id = '.Database::escape_string($values['parent_id']).' - ORDER BY survey_version DESC LIMIT 1'; + ORDER BY survey_version DESC + LIMIT 1'; $rs = Database::query($sql); if (Database::num_rows($rs) === 0) { $sql = 'SELECT survey_version FROM '.$table_survey.' @@ -2920,7 +2925,8 @@ class SurveyUtil // Navigate through the questions (next and previous) if ($currentQuestion != 0 ) { - echo ''.Display::return_icon('action_prev.png', get_lang('PreviousQuestion'), array('align' => 'middle')).' '.get_lang('PreviousQuestion').' '; + echo ''. + Display::return_icon('action_prev.png', get_lang('PreviousQuestion'), array('align' => 'middle')).' '.get_lang('PreviousQuestion').' '; } else { echo Display::return_icon('action_prev.png', get_lang('PreviousQuestion'), array('align' => 'middle')).' '.get_lang('PreviousQuestion').' '; }