chamilo / chamilo-lms

main/survey/survey_invite.php

Indentation +93 added lines, -93 removed lines

@@ -18,10 +18,10 @@ 
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -37,15 +37,15 @@ 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = SurveyManager::get_survey($survey_id);
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 // Breadcrumbs
@@ -80,23 +80,23 @@ 
 		WHERE c_id = $course_id AND code='".Database::escape_string($survey_data['code'])."'";
 $result = Database::query($sql);
 if (Database::num_rows($result) > 1) {
-	Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
+    Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
 }
 
 // Invited / answered message
 if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) {
-	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
-	$message .= get_lang('HaveAnswered').' ';
-	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
-	$message .= get_lang('WereInvited');
-	Display::display_normal_message($message, false);
+    $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
+    $message .= get_lang('HaveAnswered').' ';
+    $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
+    $message .= get_lang('WereInvited');
+    Display::display_normal_message($message, false);
 }
 
 // Building the form for publishing the survey
 $form = new FormValidator(
-	'publish_form',
-	'post',
-	api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
+    'publish_form',
+    'post',
+    api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
 );
 $form->addElement('header', '', $tool_name);
 
@@ -109,7 +109,7 @@ 
 );
 $possible_users = array();
 foreach ($complete_user_list as & $user) {
-	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 }
 
 
@@ -125,10 +125,10 @@ 
 
 // Additional users
 $form->addElement(
-	'textarea',
-	'additional_users',
-	array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
-	array('rows' => 5)
+    'textarea',
+    'additional_users',
+    array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
+    array('rows' => 5)
 );
 
 $form->addElement('html', '<div id="check_mail">');
@@ -141,15 +141,15 @@ 
 $form->addText('mail_title', get_lang('MailTitle'), false);
 // The text of the mail
 $form->addHtmlEditor(
-	'mail_text',
-	array(get_lang('MailText'), get_lang('UseLinkSyntax')),
-	false,
-	array('ToolbarSet' => 'Survey', 'Height' => '150')
+    'mail_text',
+    array(get_lang('MailText'), get_lang('UseLinkSyntax')),
+    false,
+    array('ToolbarSet' => 'Survey', 'Height' => '150')
 );
 $form->addElement('html', '</div>');
 // You cab send a reminder to unanswered people if the survey is not anonymous
 if ($survey_data['anonymous'] != 1) {
-	$form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
+    $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
 }
 // Allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
@@ -163,11 +163,11 @@ 
 }*/
 $portal_url = api_get_path(WEB_PATH);
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url = api_get_access_url($access_url_id);
-		$portal_url = $url['url'];
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url = api_get_access_url($access_url_id);
+        $portal_url = $url['url'];
+    }
 }
 
 // Show the URL that can be used by users to fill a survey without invitation
@@ -177,56 +177,56 @@ 
 $form->addElement('label', null, $auto_survey_link);
 
 if ($form->validate()) {
-   	$values = $form->exportValues();
+        $values = $form->exportValues();
     if (isset($values['send_mail']) && $values['send_mail'] == 1) {
         if (empty($values['mail_title']) || empty($values['mail_text'])) {
             Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete'));
             // Getting the invited users
-        	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-        	// Getting the survey mail text
-        	if (!empty($survey_data['reminder_mail'])) {
-        		$defaults['mail_text'] = $survey_data['reminder_mail'];
-        	} else {
-        		$defaults['mail_text'] = $survey_data['invite_mail'];
-        	}
-        	$defaults['mail_title'] = $survey_data['mail_subject'];
-        	$defaults['send_mail'] = 1;
-        	$form->setDefaults($defaults);
+            $defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+            // Getting the survey mail text
+            if (!empty($survey_data['reminder_mail'])) {
+                $defaults['mail_text'] = $survey_data['reminder_mail'];
+            } else {
+                $defaults['mail_text'] = $survey_data['invite_mail'];
+            }
+            $defaults['mail_title'] = $survey_data['mail_subject'];
+            $defaults['send_mail'] = 1;
+            $form->setDefaults($defaults);
             $form->display();
             return;
         }
     }
     // Save the invitation mail
-	SurveyUtil::save_invite_mail(
-		$values['mail_text'],
-		$values['mail_title'],
-		!empty($survey_data['invite_mail'])
-	);
+    SurveyUtil::save_invite_mail(
+        $values['mail_text'],
+        $values['mail_title'],
+        !empty($survey_data['invite_mail'])
+    );
 
     $resendAll = isset($values['resend_to_all']) ? $values['resend_to_all'] : '';
     $sendMail = isset($values['send_mail']) ? $values['send_mail'] : '';
     $remindUnAnswered = isset($values['remindUnAnswered']) ? $values['remindUnAnswered'] : '';
 
-	// Saving the invitations for the course users
-	$count_course_users = SurveyUtil::saveInvitations(
-		$values['users'],
-		$values['mail_title'],
-		$values['mail_text'],
+    // Saving the invitations for the course users
+    $count_course_users = SurveyUtil::saveInvitations(
+        $values['users'],
+        $values['mail_title'],
+        $values['mail_text'],
         $resendAll,
         $sendMail,
         $remindUnAnswered
-	);
+    );
 
-	// Saving the invitations for the additional users
-	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
-	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
-	$additional_users = explode(';', $temp);
-	for ($i = 0; $i < count($additional_users); $i++) {
-		$additional_users[$i] = trim($additional_users[$i]);
-	}
+    // Saving the invitations for the additional users
+    $values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
+    $temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
+    $additional_users = explode(';', $temp);
+    for ($i = 0; $i < count($additional_users); $i++) {
+        $additional_users[$i] = trim($additional_users[$i]);
+    }
 
-	$counter_additional_users = SurveyUtil::saveInvitations(
+    $counter_additional_users = SurveyUtil::saveInvitations(
         $additional_users,
         $values['mail_title'],
         $values['mail_text'],
@@ -235,43 +235,43 @@ 
         $remindUnAnswered
     );
 
-	// Updating the invited field in the survey table
-	SurveyUtil::update_count_invited($survey_data['code']);
-	$total_count = $count_course_users + $counter_additional_users;
+    // Updating the invited field in the survey table
+    SurveyUtil::update_count_invited($survey_data['code']);
+    $total_count = $count_course_users + $counter_additional_users;
     $table_survey = Database :: get_course_table(TABLE_SURVEY);
-	// Counting the number of people that are invited
-	$sql = "SELECT * FROM $table_survey
+    // Counting the number of people that are invited
+    $sql = "SELECT * FROM $table_survey
 	        WHERE
 	        	c_id = $course_id AND
 	        	code = '".Database::escape_string($survey_data['code'])."'
 			";
-	$result = Database::query($sql);
-	$row = Database::fetch_array($result);
-	$total_invited = $row['invited'];
+    $result = Database::query($sql);
+    $row = Database::fetch_array($result);
+    $total_invited = $row['invited'];
     if ($total_invited > 0) {
-    	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
-			$survey_data['answered'].'</a> ';
-    	$message .= get_lang('HaveAnswered').' ';
-    	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
-			$total_invited.'</a> ';
-    	$message .= get_lang('WereInvited');
-    	Display::display_normal_message($message, false);
-    	Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
+        $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
+            $survey_data['answered'].'</a> ';
+        $message .= get_lang('HaveAnswered').' ';
+        $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
+            $total_invited.'</a> ';
+        $message .= get_lang('WereInvited');
+        Display::display_normal_message($message, false);
+        Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
     }
 } else {
-	// Getting the invited users
-	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-	// Getting the survey mail text
-	if (!empty($survey_data['reminder_mail'])) {
-		$defaults['mail_text'] = $survey_data['reminder_mail'];
-	} else {
-		$defaults['mail_text'] = $survey_data['invite_mail'];
-	}
-	$defaults['mail_title'] = $survey_data['mail_subject'];
-	$defaults['send_mail'] = 1;
-
-	$form->setDefaults($defaults);
+    // Getting the invited users
+    $defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+    // Getting the survey mail text
+    if (!empty($survey_data['reminder_mail'])) {
+        $defaults['mail_text'] = $survey_data['reminder_mail'];
+    } else {
+        $defaults['mail_text'] = $survey_data['invite_mail'];
+    }
+    $defaults['mail_title'] = $survey_data['mail_subject'];
+    $defaults['send_mail'] = 1;
+
+    $form->setDefaults($defaults);
     $form->display();
 }
 Display :: display_footer();

main/gradebook/lib/be/attendancelink.class.php

Indentation +202 added lines, -202 removed lines

@@ -8,48 +8,48 @@ 
  */
 class AttendanceLink extends AbstractLink
 {
-	private $attendance_table = null;
-	private $itemprop_table = null;
+    private $attendance_table = null;
+    private $itemprop_table = null;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_ATTENDANCE);
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_ATTENDANCE);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('Attendance');
-	}
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('Attendance');
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
 
-	/**
-	 * Generate an array of attendances that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 * @todo seems to be depracated
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+    /**
+     * Generate an array of attendances that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     * @todo seems to be depracated
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
 				FROM '.$this->get_attendance_table().' att
 				WHERE
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@ 
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
 					)
 				AND att.session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         $cats = array();
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@ 
             }
         }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
-	/**
-	 * Generate an array of all attendances available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
+    /**
+     * Generate an array of all attendances available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
     public function get_all_links()
     {
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@ 
         $my_cats = isset($cats) ? $cats : null;
 
         return $my_cats;
-	}
+    }
 
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
 				WHERE
 					session_id = $session_id AND
 					c_id = '.$this->course_id.' AND
 					attendance_id = '".intval($this->get_ref_id())."'";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
 
-		return $number[0] != 0;
-	}
+        return $number[0] != 0;
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
 
-		// get attendance qualify max
-		$sql = 'SELECT att.attendance_qualify_max
+        // get attendance qualify max
+        $sql = 'SELECT att.attendance_qualify_max
 		        FROM '.$this->get_attendance_table().' att
   				WHERE
   					att.c_id = '.$this->course_id.' AND
   					att.id = '.intval($this->get_ref_id()).' AND
   					att.session_id='.intval($session_id).'';
-		$query = Database::query($sql);
-		$attendance = Database::fetch_array($query, 'ASSOC');
+        $query = Database::query($sql);
+        $attendance = Database::fetch_array($query, 'ASSOC');
 
-		// Get results
-		$sql = 'SELECT *
+        // Get results
+        $sql = 'SELECT *
 		        FROM '.$tbl_attendance_result.'
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_id);
-		}
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
+        if (isset($stud_id)) {
+            $sql .= ' AND user_id = '.intval($stud_id);
+        }
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
                 return array(
                     $data['score'],
@@ -162,7 +162,7 @@ 
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
                 return array(0, $attendance['attendance_qualify_max']);
             }
-		} else {
+        } else {
             // all students -> get average
             $students = array();  // user list, needed to make sure we only
             // take first attempts into account
@@ -171,144 +171,144 @@ 
             $sumResult = 0;
             $bestResult = 0;
 
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($attendance['attendance_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['score'];
-						$rescount++;
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
-						$sumResult += $data['score'];
-						if ($data['score'] > $bestResult) {
-							$bestResult = $data['score'];
-						}
-						$weight = $attendance['attendance_qualify_max'];
-					}
-				}
-			}
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($attendance['attendance_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['score'];
+                        $rescount++;
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
+                        $sumResult += $data['score'];
+                        if ($data['score'] > $bestResult) {
+                            $bestResult = $data['score'];
+                        }
+                        $weight = $attendance['attendance_qualify_max'];
+                    }
+                }
+            }
 
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult / $rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult / $rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
 
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_attendance_table()
-	{
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
-		return $this->attendance_table;
-	}
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_attendance_table()
+    {
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
+        return $this->attendance_table;
+    }
 
-	public function needs_name_and_description()
-	{
-		return false;
-	}
+    public function needs_name_and_description()
+    {
+        return false;
+    }
 
-	public function needs_max()
-	{
-		return false;
-	}
+    public function needs_max()
+    {
+        return false;
+    }
 
-	public function needs_results()
-	{
-		return false;
-	}
+    public function needs_results()
+    {
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_attendance_data();
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
-			return $this->attendance_data['attendance_qualify_title'];
-		} else {
-			return $attendance_title;
-		}
-	}
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_attendance_data();
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+            return $this->attendance_data['attendance_qualify_title'];
+        } else {
+            return $attendance_title;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return '';
-	}
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return '';
+    }
 
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
 
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
 
-	public function get_link()
-	{
-		//it was extracts the attendance id
-		$session_id = api_get_session_id();
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    public function get_link()
+    {
+        //it was extracts the attendance id
+        $session_id = api_get_session_id();
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
-		$attendance_id = $row['id'];
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result,'ASSOC');
+        $attendance_id = $row['id'];
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
 
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * @return array|bool
-	 */
-	private function get_attendance_data()
-	{
-		$tbl_name = $this->get_attendance_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->attendance_data)) {
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    /**
+     * @return array|bool
+     */
+    private function get_attendance_data()
+    {
+        $tbl_name = $this->get_attendance_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->attendance_data)) {
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-			$query = Database::query($sql);
-			$this->attendance_data = Database::fetch_array($query);
-		}
-		return $this->attendance_data;
-	}
+            $query = Database::query($sql);
+            $this->attendance_data = Database::fetch_array($query);
+        }
+        return $this->attendance_data;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_icon_name()
-	{
-		return 'attendance';
-	}
+    /**
+     * @return string
+     */
+    public function get_icon_name()
+    {
+        return 'attendance';
+    }
 }

main/gradebook/lib/be/surveylink.class.php

Indentation +246 added lines, -246 removed lines

@@ -8,98 +8,98 @@ 
  */
 class SurveyLink extends AbstractLink
 {
-	private $survey_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_SURVEY);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_survey_data();
+    private $survey_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_SURVEY);
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_survey_data();
 		
-		return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
-	}
-
-	public function get_description()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['subtitle'];
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Survey');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	/**
-	 * Generates an array of all surveys available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_all_links() : course code not set');
-		}
-		$tbl_survey = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		$course_id = api_get_course_int_id();
-		$sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
+        return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
+    }
+
+    public function get_description()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['subtitle'];
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Survey');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    /**
+     * Generates an array of all surveys available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_all_links() : course code not set');
+        }
+        $tbl_survey = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        $course_id = api_get_course_int_id();
+        $sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
 				WHERE c_id = '.$course_id.' AND session_id = '.intval($session_id).'';
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
-					80
-				)
-			);
-		}
-
-		return isset($links) ? $links : null;
-	}
-
-	/**
-	 * Generates an array of surveys that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT survey_id, title, code
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str(
+                    $data['code'] . ': ' . self::html_to_text($data['title']),
+                    80
+                )
+            );
+        }
+
+        return isset($links) ? $links : null;
+    }
+
+    /**
+     * Generates an array of surveys that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT survey_id, title, code
     			FROM '.$this->get_survey_table().' AS srv
 				WHERE survey_id NOT IN
 					(
@@ -110,28 +110,28 @@ 
 					)
 					AND srv.session_id = '.api_get_session_id();
 
-		$result = Database::query($sql);
-
-		$links = array();
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
-			);
-		}
-		return $links;
-	}
-
-	/**
-	 * Has anyone done this survey yet?
-	 */
-	public function has_results($stud_id=null)
-	{
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-		$sql = "SELECT
+        $result = Database::query($sql);
+
+        $links = array();
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
+            );
+        }
+        return $links;
+    }
+
+    /**
+     * Has anyone done this survey yet?
+     */
+    public function has_results($stud_id=null)
+    {
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $sql = "SELECT
 				COUNT(i.answered)
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i ON s.code = i.survey_code
@@ -141,30 +141,30 @@ 
 					s.survey_id = $ref_id AND
 					i.session_id = $session_id";
 
-		$sql_result = Database::query($sql);
-		$data = Database::fetch_array($sql_result);
+        $sql_result = Database::query($sql);
+        $data = Database::fetch_array($sql_result);
 
-		return ($data[0] != 0);
-	}
+        return ($data[0] != 0);
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		// Note: Max score is assumed to be always 1 for surveys,
-		// only student's participation is to be taken into account.
-		$max_score = 1;
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        // Note: Max score is assumed to be always 1 for surveys,
+        // only student's participation is to be taken into account.
+        $max_score = 1;
 
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
 
-		$get_individual_score = !is_null($stud_id);
+        $get_individual_score = !is_null($stud_id);
 
-		$sql = "SELECT i.answered
+        $sql = "SELECT i.answered
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i
 				ON s.code = i.survey_code
@@ -175,131 +175,131 @@ 
 					i.session_id = $session_id
 				";
 
-		if ($get_individual_score) {
-			$sql .= ' AND i.user = '.intval($stud_id);
-		}
-
-		$sql_result = Database::query($sql);
-
-		if ($get_individual_score) {
-			// for 1 student
-			if ($data = Database::fetch_array($sql_result)) {
-				return array($data['answered'] ? $max_score : 0, $max_score);
-			}
-			return array(0, $max_score);
-		} else {
-			// for all the students -> get average
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			while ($data = Database::fetch_array($sql_result)) {
-				$sum += $data['answered'] ? $max_score : 0;
-				$rescount++;
-				if ($data['answered'] > $bestResult) {
-					$bestResult = $data['answered'];
-					$weight = $assignment['qualification'];
-				}
-			}
-			$sum = $sum / $max_score;
-
-			if ($rescount == 0) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $rescount);
-					break;
-				case 'average':
-					return array($sum, $rescount);
-					break;
-				case 'ranking':
-					return null;
-					break;
-				default:
-					return array($sum, $rescount);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the surveys
-	 */
-	private function get_survey_table()
-	{
-		$this->survey_table = Database :: get_course_table(TABLE_SURVEY);
-		return $this->survey_table;
-	}
-
-	/**
-	 * Check if this still links to a survey
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
+        if ($get_individual_score) {
+            $sql .= ' AND i.user = '.intval($stud_id);
+        }
+
+        $sql_result = Database::query($sql);
+
+        if ($get_individual_score) {
+            // for 1 student
+            if ($data = Database::fetch_array($sql_result)) {
+                return array($data['answered'] ? $max_score : 0, $max_score);
+            }
+            return array(0, $max_score);
+        } else {
+            // for all the students -> get average
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            while ($data = Database::fetch_array($sql_result)) {
+                $sum += $data['answered'] ? $max_score : 0;
+                $rescount++;
+                if ($data['answered'] > $bestResult) {
+                    $bestResult = $data['answered'];
+                    $weight = $assignment['qualification'];
+                }
+            }
+            $sum = $sum / $max_score;
+
+            if ($rescount == 0) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $rescount);
+                    break;
+                case 'average':
+                    return array($sum, $rescount);
+                    break;
+                case 'ranking':
+                    return null;
+                    break;
+                default:
+                    return array($sum, $rescount);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the surveys
+     */
+    private function get_survey_table()
+    {
+        $this->survey_table = Database :: get_course_table(TABLE_SURVEY);
+        return $this->survey_table;
+    }
+
+    /**
+     * Check if this still links to a survey
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
         		 WHERE
         		 	c_id = '.$this->course_id.' AND
         		 	survey_id = '.intval($this->get_ref_id()).' AND
         		 	session_id='.intval($session_id).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
-			$tbl_name = $this->get_survey_table();
-			$session_id = api_get_session_id();
-			if ($tbl_name != '') {
-				$sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
+            $tbl_name = $this->get_survey_table();
+            $session_id = api_get_session_id();
+            if ($tbl_name != '') {
+                $sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
     					WHERE
     						c_id = '.$this->course_id.' AND
     						survey_id = '.intval($this->get_ref_id()).' AND
     						session_id = '.intval($session_id).' ';
-				$result = Database::query($sql);
-				$row = Database::fetch_array($result, 'ASSOC');
-				$survey_id = $row['survey_id'];
-				return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
-			}
-		}
-		return null;
-	}
-
-	private function get_survey_data()
-	{
-		$tbl_name = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->survey_data)) {
-			$sql = 'SELECT * FROM '.$tbl_name.'
+                $result = Database::query($sql);
+                $row = Database::fetch_array($result, 'ASSOC');
+                $survey_id = $row['survey_id'];
+                return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
+            }
+        }
+        return null;
+    }
+
+    private function get_survey_data()
+    {
+        $tbl_name = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->survey_data)) {
+            $sql = 'SELECT * FROM '.$tbl_name.'
 					WHERE
 						c_id = '.$this->course_id.' AND
 						survey_id = '.intval($this->get_ref_id()).' AND
 						session_id='.intval($session_id).'';
-			$query = Database::query($sql);
-			$this->survey_data = Database::fetch_array($query);
-		}
-		return $this->survey_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'survey';
-	}
-
-	private static function html_to_text($string)
-	{
-		return strip_tags($string);
-		//return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
-	}
+            $query = Database::query($sql);
+            $this->survey_data = Database::fetch_array($query);
+        }
+        return $this->survey_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'survey';
+    }
+
+    private static function html_to_text($string)
+    {
+        return strip_tags($string);
+        //return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
+    }
 }

main/gradebook/lib/GradebookUtils.php

Indentation +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
                     }
                 }
 
-               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&' . $courseParams.'">' .
+                $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&' . $courseParams.'">' .
                     Display::return_icon(
                         'percentage.png',
                         get_lang('EditAllWeights'),

main/inc/lib/javascript/svgedit/extensions/allowedMimeTypes.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     'jpeg' => 'image/jpeg',
     'bmp' => 'image/bmp',
     'webp' => 'image/webp',
-	'pdf' => 'application/pdf'
+    'pdf' => 'application/pdf'
 );
 
 ?>
\ No newline at end of file

main/inc/lib/javascript/svgedit/extensions/savefile.php

Indentation +13 added lines, -13 removed lines

@@ -1,16 +1,16 @@
 <?php
-	// You must first create a file "savefile_config.php" in this extensions directory and do whatever
-	//   checking of user credentials, etc. that you wish; otherwise anyone will be able to post SVG
-	//   files to your server which may cause disk space or possibly security problems
-  require('savefile_config.php');
-  if (!isset($_POST['output_svg'])) {
-		print "You must supply output_svg";
-		exit;
-	}
-	$svg = $_POST['output_svg'];
-	$filename = (isset($_POST['filename']) && !empty($_POST['filename']) ? preg_replace('@[\\\\/:*?"<>|]@u', '_', $_POST['filename']) : 'saved') . '.svg'; // These characters are indicated as prohibited by Windows
+    // You must first create a file "savefile_config.php" in this extensions directory and do whatever
+    //   checking of user credentials, etc. that you wish; otherwise anyone will be able to post SVG
+    //   files to your server which may cause disk space or possibly security problems
+    require('savefile_config.php');
+    if (!isset($_POST['output_svg'])) {
+        print "You must supply output_svg";
+        exit;
+    }
+    $svg = $_POST['output_svg'];
+    $filename = (isset($_POST['filename']) && !empty($_POST['filename']) ? preg_replace('@[\\\\/:*?"<>|]@u', '_', $_POST['filename']) : 'saved') . '.svg'; // These characters are indicated as prohibited by Windows
 
-	$fh = fopen($filename, 'w') or die("Can't open file");
-	fwrite($fh, $svg);
-	fclose($fh);
+    $fh = fopen($filename, 'w') or die("Can't open file");
+    fwrite($fh, $svg);
+    fclose($fh);
 ?>

main/inc/lib/javascript/svgedit/extensions/imagelib/users.php

Indentation +22 added lines, -22 removed lines

@@ -16,19 +16,19 @@ 
 //get all files and folders
 $scan_files = [];
 if (is_dir($user_disk_path)) {
-	$scan_files = scandir($user_disk_path);
+    $scan_files = scandir($user_disk_path);
 }
 //get all svg and png files
 $accepted_extensions = array('.svg', '.png');
 
 if (is_array($scan_files) && count($scan_files) > 0) {
-	foreach ($scan_files as & $file) {
-		$slideshow_extension = strrchr($file, '.');
-		$slideshow_extension = strtolower($slideshow_extension);
-		if (in_array($slideshow_extension, $accepted_extensions)) {
-			$png_svg_files[] =$file;
-		}
-	}
+    foreach ($scan_files as & $file) {
+        $slideshow_extension = strrchr($file, '.');
+        $slideshow_extension = strtolower($slideshow_extension);
+        if (in_array($slideshow_extension, $accepted_extensions)) {
+            $png_svg_files[] =$file;
+        }
+    }
 }
 $style = '<style>';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
@@ -47,23 +47,23 @@ 
 echo '<h2>'.get_lang('SocialNetwork').': '.get_lang('MyFiles').'</h2>';
 
 if (!empty($png_svg_files)) {
-	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
-	echo '<ul>';
-	foreach($png_svg_files as $filename) {
-		$image = $user_disk_path.$filename;
+    echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
+    echo '<ul>';
+    foreach($png_svg_files as $filename) {
+        $image = $user_disk_path.$filename;
 
-		if (strpos($filename, "svg")){
-			$new_sizes['width'] = 60;
-			$new_sizes['height'] = 60;
-		} else {
-			$new_sizes = api_resize_image($image, 60, 60);
-		}
+        if (strpos($filename, "svg")){
+            $new_sizes['width'] = 60;
+            $new_sizes['height'] = 60;
+        } else {
+            $new_sizes = api_resize_image($image, 60, 60);
+        }
 
-		echo '<li style="display:inline; padding:8px;"><a href="'.$user_web_path.$filename.'" alt "'.$filename.'" title="'.$filename.'"><img src="'.$user_web_path.$filename.'" width="'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
-	}
-	echo '</ul>';
+        echo '<li style="display:inline; padding:8px;"><a href="'.$user_web_path.$filename.'" alt "'.$filename.'" title="'.$filename.'"><img src="'.$user_web_path.$filename.'" width="'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
+    }
+    echo '</ul>';
 } else {
-	Display::display_warning_message(get_lang('NoSVGImages'));
+    Display::display_warning_message(get_lang('NoSVGImages'));
 }
 ?>
 </body>

main/inc/lib/javascript/svgedit/extensions/imagelib/index.php

Indentation +27 added lines, -27 removed lines

@@ -23,22 +23,22 @@ 
 $array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
 
 if (count($array_to_search) > 0) {
-	while (list($key) = each($array_to_search)) {
-		$all_files[] = basename($array_to_search[$key]['path']);
-	}
+    while (list($key) = each($array_to_search)) {
+        $all_files[] = basename($array_to_search[$key]['path']);
+    }
 }
 
 //get all svg and png files
 $accepted_extensions = array('.svg', '.png');
 
 if (is_array($all_files) && count($all_files) > 0) {
-	foreach ($all_files as & $file) {
-		$slideshow_extension = strrchr($file, '.');
-		$slideshow_extension = strtolower($slideshow_extension);
-		if (in_array($slideshow_extension, $accepted_extensions)) {
-			$png_svg_files[] =$file;
-		}
-	}
+    foreach ($all_files as & $file) {
+        $slideshow_extension = strrchr($file, '.');
+        $slideshow_extension = strtolower($slideshow_extension);
+        if (in_array($slideshow_extension, $accepted_extensions)) {
+            $png_svg_files[] =$file;
+        }
+    }
 }
 
 $disk_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document/images/gallery/';
@@ -57,24 +57,24 @@ 
 <?php
 echo '<h2>'.get_lang('Course').': '.$course_info['name'].'</h2>';
 if (!empty($png_svg_files)) {
-	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
-	echo '<ul>';
-	foreach($png_svg_files as $filename) {
-		$image=$disk_path.$filename;
-
-		if (strpos($filename, "svg")){
-			$new_sizes['width'] = 60;
-			$new_sizes['height'] = 60;
-		}
-		else {
-			$new_sizes = api_resize_image($image, 60, 60);
-		}
-
-		echo '<li style="display:inline; padding:8px;"><a href="'.$web_path.$filename.'" alt "'.$filename.'" title="'.$filename.'"><img src="'.$web_path.$filename.'" width="'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
-	}
-	echo '</ul>';
+    echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
+    echo '<ul>';
+    foreach($png_svg_files as $filename) {
+        $image=$disk_path.$filename;
+
+        if (strpos($filename, "svg")){
+            $new_sizes['width'] = 60;
+            $new_sizes['height'] = 60;
+        }
+        else {
+            $new_sizes = api_resize_image($image, 60, 60);
+        }
+
+        echo '<li style="display:inline; padding:8px;"><a href="'.$web_path.$filename.'" alt "'.$filename.'" title="'.$filename.'"><img src="'.$web_path.$filename.'" width="'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
+    }
+    echo '</ul>';
 } else {
-	Display::display_warning_message(get_lang('NoSVGImagesInImagesGalleryPath'));
+    Display::display_warning_message(get_lang('NoSVGImagesInImagesGalleryPath'));
 }
 ?>
 </body>

main/inc/lib/exercise_show_functions.lib.php

Indentation +107 added lines, -107 removed lines

@@ -17,25 +17,25 @@ 
  */
 class ExerciseShowFunctions
 {
-	/**
-	 * Shows the answer to a fill-in-the-blanks question, as HTML
+    /**
+     * Shows the answer to a fill-in-the-blanks question, as HTML
      * @param int $feedbackType
-	 * @param string    $answer
-	 * @param int $id       Exercise ID
-	 * @param int $questionId      Question ID
+     * @param string    $answer
+     * @param int $id       Exercise ID
+     * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
      *
-	 * @return void
-	 */
-	public static function display_fill_in_blanks_answer(
-	    $feedbackType,
-	    $answer,
-	    $id,
-	    $questionId,
-	    $resultsDisabled,
-	    $originalStudentAnswer = '',
-	    $showTotalScoreAndUserChoices
+     * @return void
+     */
+    public static function display_fill_in_blanks_answer(
+        $feedbackType,
+        $answer,
+        $id,
+        $questionId,
+        $resultsDisabled,
+        $originalStudentAnswer = '',
+        $showTotalScoreAndUserChoices
     ) {
         $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $resultsDisabled, $showTotalScoreAndUserChoices);
         if (strpos($originalStudentAnswer, 'font color') !== false) {
@@ -64,7 +64,7 @@ 
             </tr>
         <?php
         }
-	}
+    }
 
     /**
      * Shows the answer to a calculated question, as HTML
@@ -105,20 +105,20 @@ 
         }
     }
 
-	/**
-	 * Shows the answer to a free-answer question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	public static function display_free_answer(
-	    $feedback_type,
-	    $answer,
-	    $exe_id,
-	    $questionId,
-	    $questionScore = null,
-	    $results_disabled = 0
+    /**
+     * Shows the answer to a free-answer question, as HTML
+     * @param string    Answer text
+     * @param int       Exercise ID
+     * @param int       Question ID
+     * @return void
+     */
+    public static function display_free_answer(
+        $feedback_type,
+        $answer,
+        $exe_id,
+        $questionId,
+        $questionScore = null,
+        $results_disabled = 0
     ) {
         $comments = Event::get_comments($exe_id, $questionId);
 
@@ -136,17 +136,17 @@ 
                 echo '</tr>';
             }
         }
-	}
+    }
 
     /**
-    * @param $feedback_type
-    * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
-    * @param int $results_disabled
+     * @param $feedback_type
+     * @param $answer
+     * @param $id
+     * @param $questionId
+     * @param null $nano
+     * @param int $results_disabled
      */
-	public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
+    public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
     {
         if (isset($fileUrl)) {
             echo '
@@ -184,8 +184,8 @@ 
         }
     }
 
-	/**
-	 * Displays the answer to a hotspot question
+    /**
+     * Displays the answer to a hotspot question
      * @param int $feedback_type
      * @param int $answerId
      * @param string $answer
@@ -194,7 +194,7 @@ 
      * @param int $resultsDisabled
      * @param int $orderColor
      */
-	public static function display_hotspot_answer(
+    public static function display_hotspot_answer(
         $feedback_type,
         $answerId,
         $answer,
@@ -217,7 +217,7 @@ 
             }
         }
 
-		$hotspot_colors = array(
+        $hotspot_colors = array(
             "", // $i starts from 1 on next loop (ugly fix)
             "#4271B5",
             "#FE8E16",
@@ -234,7 +234,7 @@ 
             "#F7BDE2"
         );
 
-		?>
+        ?>
 		<table class="data_table">
 		<tr>
             <td class="text-center" width="5%">
@@ -246,10 +246,10 @@ 
 			<td class="text-left" width="10%">
 				<?php
                 if (!$hide_expected_answer) {
-    				$my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
-    				echo $my_choice;
+                    $my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
+                    echo $my_choice;
                 }
-				?>
+                ?>
 			</td>
 			<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 			<td class="text-left" width="60%">
@@ -257,29 +257,29 @@ 
                 if ($studentChoice) {
                     echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
                 }
-				?>
+                ?>
 			</td>
 			<?php } else { ?>
 				<td class="text-left" width="60%">&nbsp;</td>
 			<?php } ?>
 		</tr>
 		<?php
-	}
-
-	/**
-	 * Display the answers to a multiple choice question
-	 * @param int $feedback_type Feedback type
-	 * @param integer Answer type
-	 * @param integer Student choice
-	 * @param string  Textual answer
-	 * @param string  Comment on answer
-	 * @param string  Correct answer comment
-	 * @param integer Exercise ID
-	 * @param integer Question ID
-	 * @param boolean Whether to show the answer comment or not
-	 * @return void
-	 */
-	public static function display_unique_or_multiple_answer(
+    }
+
+    /**
+     * Display the answers to a multiple choice question
+     * @param int $feedback_type Feedback type
+     * @param integer Answer type
+     * @param integer Student choice
+     * @param string  Textual answer
+     * @param string  Comment on answer
+     * @param string  Correct answer comment
+     * @param integer Exercise ID
+     * @param integer Question ID
+     * @param boolean Whether to show the answer comment or not
+     * @return void
+     */
+    public static function display_unique_or_multiple_answer(
         $feedback_type,
         $answerType,
         $studentChoice,
@@ -307,14 +307,14 @@ 
         }
 
         $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$icon .= $studentChoice?'_on':'_off';
-		$icon .= '.gif';
+        $icon .= $studentChoice?'_on':'_off';
+        $icon .= '.gif';
 
-		$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$iconAnswer .= $answerCorrect?'_on':'_off';
-		$iconAnswer .= '.gif';
+        $iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
+        $iconAnswer .= $answerCorrect?'_on':'_off';
+        $iconAnswer .= '.gif';
 
-		?>
+        ?>
 		<tr>
 		<td width="5%">
 			<?php echo Display::return_icon($icon); ?>
@@ -328,39 +328,39 @@ 
 		</td>
 		<td width="40%">
 			<?php
-			echo $answer;
-			?>
+            echo $answer;
+            ?>
 		</td>
 
 		<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 		<td width="20%">
 			<?php
             if ($studentChoice) {
-				if ($answerCorrect) {
+                if ($answerCorrect) {
                     $color = 'green';
-					//echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
-				} else {
+                    //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
+                } else {
                     $color = 'black';
                     //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
-				}
-				if ($hide_expected_answer) {
-				    $color = '';
-				}
+                }
+                if ($hide_expected_answer) {
+                    $color = '';
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
-			}
-			?>
+            }
+            ?>
 		</td>
 			<?php
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
-			}
-		    ?>
+            if ($ans==1) {
+                $comm = Event::get_comments($id,$questionId);
+            }
+            ?>
 		 <?php } else { ?>
 			<td>&nbsp;</td>
 		<?php } ?>
 		</tr>
 		<?php
-	}
+    }
 
     /**
      * Display the answers to a multiple choice question
@@ -413,7 +413,7 @@ 
         if (isset($new_options[$studentChoice])) {
             echo get_lang($new_options[$studentChoice]['name']);
         } else {
-        	echo '-';
+            echo '-';
         }
 
         ?>
@@ -421,7 +421,7 @@ 
         <td width="5%">
         <?php
 
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($new_options[$answerCorrect])) {
                 echo get_lang($new_options[$answerCorrect]['name']);
@@ -447,8 +447,8 @@ 
                 }
 
                 if ($hide_expected_answer) {
-				    $color = '';
-				}
+                    $color = '';
+                }
 
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
@@ -466,19 +466,19 @@ 
         <?php
     }
 
-     /**
-     * Display the answers to a multiple choice question
-     *
-     * @param integer Answer type
-     * @param integer Student choice
-     * @param string  Textual answer
-     * @param string  Comment on answer
-     * @param string  Correct answer comment
-     * @param integer Exercise ID
-     * @param integer Question ID
-     * @param boolean Whether to show the answer comment or not
-     * @return void
-     */
+        /**
+         * Display the answers to a multiple choice question
+         *
+         * @param integer Answer type
+         * @param integer Student choice
+         * @param string  Textual answer
+         * @param string  Comment on answer
+         * @param string  Correct answer comment
+         * @param integer Exercise ID
+         * @param integer Question ID
+         * @param boolean Whether to show the answer comment or not
+         * @return void
+         */
     public static function display_multiple_answer_combination_true_false(
         $feedback_type,
         $answerType,
@@ -509,7 +509,7 @@ 
         <tr>
         <td width="5%">
         <?php
-		//Your choice
+        //Your choice
         $question = new MultipleAnswerCombinationTrueFalse();
         if (isset($question->options[$studentChoice])) {
             echo $question->options[$studentChoice];
@@ -520,7 +520,7 @@ 
         </td>
         <td width="5%">
         <?php
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($question->options[$answerCorrect])) {
                 echo $question->options[$answerCorrect];
@@ -545,14 +545,14 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }
-            	//echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
+                //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
                 if ($hide_expected_answer) {
                     $color = '';
-				}
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
             ?>