chamilo / chamilo-lms

main/auth/external_login/facebook-php-sdk/src/Facebook/Entities/AccessToken.php

Indentation +246 added lines, -246 removed lines

@@ -35,120 +35,120 @@ 
 class AccessToken
 {
 
-  /**
-   * The access token.
-   *
-   * @var string
-   */
-  protected $accessToken;
-
-  /**
-   * A unique ID to identify a client.
-   *
-   * @var string
-   */
-  protected $machineId;
-
-  /**
-   * Date when token expires.
-   *
-   * @var \DateTime|null
-   */
-  protected $expiresAt;
-
-  /**
-   * Create a new access token entity.
-   *
-   * @param string $accessToken
-   * @param int $expiresAt
-   * @param string|null machineId
-   * @param string $machineId
-   */
-  public function __construct($accessToken, $expiresAt = 0, $machineId = null)
-  {
+    /**
+     * The access token.
+     *
+     * @var string
+     */
+    protected $accessToken;
+
+    /**
+     * A unique ID to identify a client.
+     *
+     * @var string
+     */
+    protected $machineId;
+
+    /**
+     * Date when token expires.
+     *
+     * @var \DateTime|null
+     */
+    protected $expiresAt;
+
+    /**
+     * Create a new access token entity.
+     *
+     * @param string $accessToken
+     * @param int $expiresAt
+     * @param string|null machineId
+     * @param string $machineId
+     */
+    public function __construct($accessToken, $expiresAt = 0, $machineId = null)
+    {
     $this->accessToken = $accessToken;
     if ($expiresAt) {
-      $this->setExpiresAtFromTimeStamp($expiresAt);
+        $this->setExpiresAtFromTimeStamp($expiresAt);
     }
     $this->machineId = $machineId;
-  }
-
-  /**
-   * Setter for expires_at.
-   *
-   * @param int $timeStamp
-   */
-  protected function setExpiresAtFromTimeStamp($timeStamp)
-  {
+    }
+
+    /**
+     * Setter for expires_at.
+     *
+     * @param int $timeStamp
+     */
+    protected function setExpiresAtFromTimeStamp($timeStamp)
+    {
     $dt = new \DateTime();
     $dt->setTimestamp($timeStamp);
     $this->expiresAt = $dt;
-  }
-
-  /**
-   * Getter for expiresAt.
-   *
-   * @return \DateTime|null
-   */
-  public function getExpiresAt()
-  {
+    }
+
+    /**
+     * Getter for expiresAt.
+     *
+     * @return \DateTime|null
+     */
+    public function getExpiresAt()
+    {
     return $this->expiresAt;
-  }
-
-  /**
-   * Getter for machineId.
-   *
-   * @return string
-   */
-  public function getMachineId()
-  {
+    }
+
+    /**
+     * Getter for machineId.
+     *
+     * @return string
+     */
+    public function getMachineId()
+    {
     return $this->machineId;
-  }
-
-  /**
-   * Determines whether or not this is a long-lived token.
-   *
-   * @return bool
-   */
-  public function isLongLived()
-  {
+    }
+
+    /**
+     * Determines whether or not this is a long-lived token.
+     *
+     * @return bool
+     */
+    public function isLongLived()
+    {
     if ($this->expiresAt) {
-      return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
+        return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
     }
     return false;
-  }
-
-  /**
-   * Checks the validity of the access token.
-   *
-   * @param string|null $appId Application ID to use
-   * @param string|null $appSecret App secret value to use
-   * @param string|null $machineId
-   *
-   * @return boolean
-   */
-  public function isValid($appId = null, $appSecret = null, $machineId = null)
-  {
+    }
+
+    /**
+     * Checks the validity of the access token.
+     *
+     * @param string|null $appId Application ID to use
+     * @param string|null $appSecret App secret value to use
+     * @param string|null $machineId
+     *
+     * @return boolean
+     */
+    public function isValid($appId = null, $appSecret = null, $machineId = null)
+    {
     $accessTokenInfo = $this->getInfo($appId, $appSecret);
     $machineId = $machineId ?: $this->machineId;
     return static::validateAccessToken($accessTokenInfo, $appId, $machineId);
-  }
-
-  /**
-   * Ensures the provided GraphSessionInfo object is valid,
-   *   throwing an exception if not.  Ensures the appId matches,
-   *   that the machineId matches if it's being used,
-   *   that the token is valid and has not expired.
-   *
-   * @param GraphSessionInfo $tokenInfo
-   * @param string|null $appId Application ID to use
-   * @param string|null $machineId
-   *
-   * @return boolean
-   */
-  public static function validateAccessToken(GraphSessionInfo $tokenInfo,
-                                             $appId = null, $machineId = null)
-  {
+    }
+
+    /**
+     * Ensures the provided GraphSessionInfo object is valid,
+     *   throwing an exception if not.  Ensures the appId matches,
+     *   that the machineId matches if it's being used,
+     *   that the token is valid and has not expired.
+     *
+     * @param GraphSessionInfo $tokenInfo
+     * @param string|null $appId Application ID to use
+     * @param string|null $machineId
+     *
+     * @return boolean
+     */
+    public static function validateAccessToken(GraphSessionInfo $tokenInfo,
+                                                $appId = null, $machineId = null)
+    {
     $targetAppId = FacebookSession::_getTargetAppId($appId);
 
     $appIdIsValid = $tokenInfo->getAppId() == $targetAppId;
@@ -157,90 +157,90 @@ 
 
     // Not all access tokens return an expiration. E.g. an app access token.
     if ($tokenInfo->getExpiresAt() instanceof \DateTime) {
-      $accessTokenIsStillAlive = $tokenInfo->getExpiresAt()->getTimestamp() >= time();
+        $accessTokenIsStillAlive = $tokenInfo->getExpiresAt()->getTimestamp() >= time();
     } else {
-      $accessTokenIsStillAlive = true;
+        $accessTokenIsStillAlive = true;
     }
 
     return $appIdIsValid && $machineIdIsValid && $accessTokenIsValid && $accessTokenIsStillAlive;
-  }
-
-  /**
-   * Get a valid access token from a code.
-   *
-   * @param string $code
-   * @param string|null $appId
-   * @param string|null $appSecret
-   * @param string|null $machineId
-   *
-   * @return AccessToken
-   */
-  public static function getAccessTokenFromCode($code, $appId = null, $appSecret = null, $machineId = null)
-  {
+    }
+
+    /**
+     * Get a valid access token from a code.
+     *
+     * @param string $code
+     * @param string|null $appId
+     * @param string|null $appSecret
+     * @param string|null $machineId
+     *
+     * @return AccessToken
+     */
+    public static function getAccessTokenFromCode($code, $appId = null, $appSecret = null, $machineId = null)
+    {
     $params = array(
-      'code' => $code,
-      'redirect_uri' => '',
+        'code' => $code,
+        'redirect_uri' => '',
     );
 
     if ($machineId) {
-      $params['machine_id'] = $machineId;
+        $params['machine_id'] = $machineId;
     }
 
     return static::requestAccessToken($params, $appId, $appSecret);
-  }
-
-  /**
-   * Get a valid code from an access token.
-   *
-   * @param AccessToken $accessToken
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return string
-   */
-  public static function getCodeFromAccessToken($accessToken, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Get a valid code from an access token.
+     *
+     * @param AccessToken $accessToken
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return string
+     */
+    public static function getCodeFromAccessToken($accessToken, $appId = null, $appSecret = null)
+    {
     $accessToken = (string) $accessToken;
 
     $params = array(
-      'access_token' => $accessToken,
-      'redirect_uri' => '',
+        'access_token' => $accessToken,
+        'redirect_uri' => '',
     );
 
     return static::requestCode($params, $appId, $appSecret);
-  }
-
-  /**
-   * Exchanges a short lived access token with a long lived access token.
-   *
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return AccessToken
-   */
-  public function extend($appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Exchanges a short lived access token with a long lived access token.
+     *
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return AccessToken
+     */
+    public function extend($appId = null, $appSecret = null)
+    {
     $params = array(
-      'grant_type' => 'fb_exchange_token',
-      'fb_exchange_token' => $this->accessToken,
+        'grant_type' => 'fb_exchange_token',
+        'fb_exchange_token' => $this->accessToken,
     );
 
     return static::requestAccessToken($params, $appId, $appSecret);
-  }
-
-  /**
-   * Request an access token based on a set of params.
-   *
-   * @param array $params
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return AccessToken
-   *
-   * @throws FacebookRequestException
-   */
-  public static function requestAccessToken(array $params, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Request an access token based on a set of params.
+     *
+     * @param array $params
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return AccessToken
+     *
+     * @throws FacebookRequestException
+     */
+    public static function requestAccessToken(array $params, $appId = null, $appSecret = null)
+    {
     $response = static::request('/oauth/access_token', $params, $appId, $appSecret);
     $data = $response->getResponse();
 
@@ -249,133 +249,133 @@ 
      * @see https://github.com/facebook/facebook-php-sdk-v4/issues/36
      */
     if (is_array($data)) {
-      if (isset($data['access_token'])) {
+        if (isset($data['access_token'])) {
         $expiresAt = isset($data['expires']) ? time() + $data['expires'] : 0;
         return new static($data['access_token'], $expiresAt);
-      }
+        }
     } elseif($data instanceof \stdClass) {
-      if (isset($data->access_token)) {
+        if (isset($data->access_token)) {
         $expiresAt = isset($data->expires_in) ? time() + $data->expires_in : 0;
         $machineId = isset($data->machine_id) ? (string) $data->machine_id : null;
         return new static((string) $data->access_token, $expiresAt, $machineId);
-      }
+        }
     }
 
     throw FacebookRequestException::create(
-      $response->getRawResponse(),
-      $data,
-      401
+        $response->getRawResponse(),
+        $data,
+        401
     );
-  }
-
-  /**
-   * Request a code from a long lived access token.
-   *
-   * @param array $params
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return string
-   *
-   * @throws FacebookRequestException
-   */
-  public static function requestCode(array $params, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Request a code from a long lived access token.
+     *
+     * @param array $params
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return string
+     *
+     * @throws FacebookRequestException
+     */
+    public static function requestCode(array $params, $appId = null, $appSecret = null)
+    {
     $response = static::request('/oauth/client_code', $params, $appId, $appSecret);
     $data = $response->getResponse();
 
     if (isset($data->code)) {
-      return (string) $data->code;
+        return (string) $data->code;
     }
 
     throw FacebookRequestException::create(
-      $response->getRawResponse(),
-      $data,
-      401
+        $response->getRawResponse(),
+        $data,
+        401
     );
-  }
-
-  /**
-   * Send a request to Graph with an app access token.
-   *
-   * @param string $endpoint
-   * @param array $params
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return \Facebook\FacebookResponse
-   *
-   * @throws FacebookRequestException
-   */
-  protected static function request($endpoint, array $params, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Send a request to Graph with an app access token.
+     *
+     * @param string $endpoint
+     * @param array $params
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return \Facebook\FacebookResponse
+     *
+     * @throws FacebookRequestException
+     */
+    protected static function request($endpoint, array $params, $appId = null, $appSecret = null)
+    {
     $targetAppId = FacebookSession::_getTargetAppId($appId);
     $targetAppSecret = FacebookSession::_getTargetAppSecret($appSecret);
 
     if (!isset($params['client_id'])) {
-      $params['client_id'] = $targetAppId;
+        $params['client_id'] = $targetAppId;
     }
     if (!isset($params['client_secret'])) {
-      $params['client_secret'] = $targetAppSecret;
+        $params['client_secret'] = $targetAppSecret;
     }
 
     // The response for this endpoint is not JSON, so it must be handled
     //   differently, not as a GraphObject.
     $request = new FacebookRequest(
-      FacebookSession::newAppSession($targetAppId, $targetAppSecret),
-      'GET',
-      $endpoint,
-      $params
+        FacebookSession::newAppSession($targetAppId, $targetAppSecret),
+        'GET',
+        $endpoint,
+        $params
     );
     return $request->execute();
-  }
-
-  /**
-   * Get more info about an access token.
-   *
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return GraphSessionInfo
-   */
-  public function getInfo($appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Get more info about an access token.
+     *
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return GraphSessionInfo
+     */
+    public function getInfo($appId = null, $appSecret = null)
+    {
     $params = array('input_token' => $this->accessToken);
 
     $request = new FacebookRequest(
-      FacebookSession::newAppSession($appId, $appSecret),
-      'GET',
-      '/debug_token',
-      $params
+        FacebookSession::newAppSession($appId, $appSecret),
+        'GET',
+        '/debug_token',
+        $params
     );
     $response = $request->execute()->getGraphObject(GraphSessionInfo::className());
 
     // Update the data on this token
     if ($response->getExpiresAt()) {
-      $this->expiresAt = $response->getExpiresAt();
+        $this->expiresAt = $response->getExpiresAt();
     }
 
     return $response;
-  }
-
-  /**
-   * Returns the access token as a string.
-   *
-   * @return string
-   */
-  public function __toString()
-  {
+    }
+
+    /**
+     * Returns the access token as a string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
     return $this->accessToken;
-  }
-
-  /**
-   * Returns true if the access token is an app session token.
-   *
-   * @return bool
-   */
-  public function isAppSession()
-  {
+    }
+
+    /**
+     * Returns true if the access token is an app session token.
+     *
+     * @return bool
+     */
+    public function isAppSession()
+    {
     return strpos($this->accessToken, "|") !== false;
-  }
+    }
 
 }

main/exercice/exercise_show.php

Indentation +136 added lines, -136 removed lines

@@ -92,7 +92,7 @@ 
 $locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
 
 if (empty($objExercise)) {
-	$objExercise = new Exercise();
+    $objExercise = new Exercise();
     $objExercise->read($exercise_id);
 }
 $feedback_type = $objExercise->feedback_type;
@@ -100,16 +100,16 @@ 
 //Only users can see their own results
 if (!$is_allowedToEdit) {
     if ($student_id != $current_user_id) {
-    	api_not_allowed(true);
+        api_not_allowed(true);
     }
 }
 
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	Security::remove_XSS($_SESSION['gradebook']);
+    $gradebook=	Security::remove_XSS($_SESSION['gradebook']);
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
 }
 
 $fromlink = '';
@@ -124,14 +124,14 @@ 
 $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
 
 if ($origin != 'learnpath') {
-	Display::display_header('');
+    Display::display_header('');
 } else {
     $htmlHeadXtra[] = "
     <style>
     body { background: none;}
     </style>
     ";
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 ?>
 <script>
@@ -232,12 +232,12 @@ 
         }
     }
 } else {
-	Display::display_warning_message(get_lang('CantViewResults'));
-	$show_results = false;
+    Display::display_warning_message(get_lang('CantViewResults'));
+    $show_results = false;
 }
 
 if ($origin == 'learnpath' && !isset($_GET['fb_type']) ) {
-	$show_results = false;
+    $show_results = false;
 }
 
 if ($show_results || $show_only_total_score || $showTotalScoreAndUserChoices) {
@@ -285,13 +285,13 @@ 
 $exerciseResult = array();
 
 while ($row = Database::fetch_array($result)) {
-	$question_list_from_database[] = $row['question_id'];
-	$exerciseResult[$row['question_id']] = $row['answer'];
+    $question_list_from_database[] = $row['question_id'];
+    $exerciseResult[$row['question_id']] = $row['answer'];
 }
 
 //Fixing #2073 Fixing order of questions
 if (!empty($track_exercise_info['data_tracking'])) {
-	$temp_question_list = explode(',', $track_exercise_info['data_tracking']);
+    $temp_question_list = explode(',', $track_exercise_info['data_tracking']);
 
     // Getting question list from data_tracking
     if (!empty($temp_question_list)) {
@@ -330,21 +330,21 @@ 
 
 foreach ($questionList as $questionId) {
 
-	$choice = $exerciseResult[$questionId];
-	// destruction of the Question object
-	unset($objQuestionTmp);
+    $choice = $exerciseResult[$questionId];
+    // destruction of the Question object
+    unset($objQuestionTmp);
 
     // creates a temporary Question object
     $objQuestionTmp = Question::read($questionId);
     $questionWeighting = $objQuestionTmp->selectWeighting();
     $answerType = $objQuestionTmp->selectType();
 
-	// Start buffer
+    // Start buffer
     ob_start();
 
     // Use switch
 
-	if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
+    if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
         $question_result = $objExercise->manage_answer(
             $id,
             $questionId,
@@ -490,12 +490,12 @@ 
         );
         $questionScore = $question_result['score'];
         $totalScore += $question_result['score'];
-	} elseif ($answerType == HOT_SPOT) {
-	    if ($show_results || $showTotalScoreAndUserChoices) {
-		    echo '<table width="500" border="0"><tr>
+    } elseif ($answerType == HOT_SPOT) {
+        if ($show_results || $showTotalScoreAndUserChoices) {
+            echo '<table width="500" border="0"><tr>
                     <td valign="top" align="center" style="padding-left:0px;" >
                         <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';
-		}
+        }
         $question_result = $objExercise->manage_answer(
             $id,
             $questionId,
@@ -536,7 +536,7 @@ 
                 <br>
             ";
         }
-	} else if($answerType == HOT_SPOT_DELINEATION) {
+    } else if($answerType == HOT_SPOT_DELINEATION) {
 
         $question_result = $objExercise->manage_answer(
             $id,
@@ -693,15 +693,15 @@ 
                 </table>
             ";
         }
-	}
+    }
 
-	if ($show_results) {
-	    if ($answerType != HOT_SPOT) {
-	        echo '</table>';
-	    }
-	}
+    if ($show_results) {
+        if ($answerType != HOT_SPOT) {
+            echo '</table>';
+        }
+    }
 
-	$comnt = null;
+    $comnt = null;
 
     if ($show_results) {
         if (
@@ -718,18 +718,18 @@ 
 
         $marksname = '';
 
-		if ($isFeedbackAllowed) {
-			$name = "fckdiv".$questionId;
-			$marksname = "marksName".$questionId;
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$url_name = get_lang('EditCommentsAndMarks');
-			} else {
-				if ($action=='edit') {
-					$url_name = get_lang('EditIndividualComment');
-				} else {
-					$url_name = get_lang('AddComments');
-				}
-			}
+        if ($isFeedbackAllowed) {
+            $name = "fckdiv".$questionId;
+            $marksname = "marksName".$questionId;
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $url_name = get_lang('EditCommentsAndMarks');
+            } else {
+                if ($action=='edit') {
+                    $url_name = get_lang('EditIndividualComment');
+                } else {
+                    $url_name = get_lang('AddComments');
+                }
+            }
             echo '<br />';
             echo Display::url(
                 $url_name,
@@ -738,26 +738,26 @@ 
                     'class' => 'btn btn-default',
                     'onclick' => "showfck('".$name."', '".$marksname."');")
             );
-			echo '<br />';
+            echo '<br />';
 
             echo '<div id="feedback_'.$name.'" style="width:100%">';
-			$comnt = trim(Event::get_comments($id, $questionId));
-			if (empty($comnt)) {
-				echo '<br />';
-			} else {
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-			echo '</div>';
+            $comnt = trim(Event::get_comments($id, $questionId));
+            if (empty($comnt)) {
+                echo '<br />';
+            } else {
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+            echo '</div>';
 
             echo '<div id="'.$name.'" style="display:none">';
-			$arrid[] = $questionId;
-			$feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
-			$feedback_form->addElement('html','<br>');
-			$renderer =& $feedback_form->defaultRenderer();
-			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
-			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
-			$comnt = Event::get_comments($id, $questionId);
-			$default = array('comments_'.$questionId =>  $comnt);
+            $arrid[] = $questionId;
+            $feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
+            $feedback_form->addElement('html','<br>');
+            $renderer =& $feedback_form->defaultRenderer();
+            $renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
+            $renderer->setCustomElementTemplate('<div align="left">{element}</div>');
+            $comnt = Event::get_comments($id, $questionId);
+            $default = array('comments_'.$questionId =>  $comnt);
 
             if ($useAdvancedEditor) {
                 $feedback_form->addElement(
@@ -774,52 +774,52 @@ 
             } else {
                 $feedback_form->addElement('textarea', 'comments_' . $questionId);
             }
-			$feedback_form->addElement('html','<br>');
-			$feedback_form->setDefaults($default);
-			$feedback_form->display();
-			echo '</div>';
-
-		} else {
-			$comnt = Event::get_comments($id, $questionId);
-			echo '<br />';
-			if (!empty($comnt)) {
-				echo '<b>'.get_lang('Feedback').'</b>';
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-		}
-
-		if ($is_allowedToEdit && $isFeedbackAllowed) {
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$marksname = "marksName".$questionId;
+            $feedback_form->addElement('html','<br>');
+            $feedback_form->setDefaults($default);
+            $feedback_form->display();
+            echo '</div>';
+
+        } else {
+            $comnt = Event::get_comments($id, $questionId);
+            echo '<br />';
+            if (!empty($comnt)) {
+                echo '<b>'.get_lang('Feedback').'</b>';
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+        }
+
+        if ($is_allowedToEdit && $isFeedbackAllowed) {
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $marksname = "marksName".$questionId;
                 echo '<div id="'.$marksname.'" style="display:none">';
                 echo '<form name="marksform_'.$questionId.'" method="post" action="">';
-				$arrmarks[] = $questionId;
-				echo get_lang("AssignMarks");
-				echo "&nbsp;<select name='marks' id='marks'>";
-				for ($i=0;$i<=$questionWeighting;$i++) {
-					echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
-				}
-				echo '</select>';
-				echo '</form><br /></div>';
-
-				if ($questionScore == -1 ) {
-					$questionScore = 0;
-				  	echo Display::return_message(get_lang('notCorrectedYet'));
-				}
-			} else {
-				$arrmarks[] = $questionId;
-				echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
+                $arrmarks[] = $questionId;
+                echo get_lang("AssignMarks");
+                echo "&nbsp;<select name='marks' id='marks'>";
+                for ($i=0;$i<=$questionWeighting;$i++) {
+                    echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
+                }
+                echo '</select>';
+                echo '</form><br /></div>';
+
+                if ($questionScore == -1 ) {
+                    $questionScore = 0;
+                        echo Display::return_message(get_lang('notCorrectedYet'));
+                }
+            } else {
+                $arrmarks[] = $questionId;
+                echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
 					  <select name="marks" id="marks" style="display:none;"><option>'.$questionScore.'</option></select></form><br/ ></div>';
-			}
-		} else {
-			if ($questionScore == -1) {
-				 $questionScore = 0;
-			}
-		}
-	}
+            }
+        } else {
+            if ($questionScore == -1) {
+                    $questionScore = 0;
+            }
+        }
+    }
 
     $my_total_score = $questionScore;
-	$my_total_weight = $questionWeighting;
+    $my_total_weight = $questionWeighting;
     $totalWeighting += $questionWeighting;
     $category_was_added_for_this_test = false;
 
@@ -865,7 +865,7 @@ 
 
     $score = array();
     if ($show_results) {
-		$score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
+        $score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
         $score['pass'] = $my_total_score >= $my_total_weight ? true : false;
         $score['type'] = $answerType;
         $score['score'] = $my_total_score;
@@ -873,16 +873,16 @@ 
         $score['comments'] = isset($comnt) ? $comnt : null;
     }
 
-	unset($objAnswerTmp);
-	$i++;
+    unset($objAnswerTmp);
+    $i++;
 
     $contents = ob_get_clean();
     $question_content = '<div class="question_row">';
- 	if ($show_results) {
+        if ($show_results) {
         // Shows question title an description
-	    $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
-	}
-	$counter++;
+        $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
+    }
+    $counter++;
     $question_content .= $contents;
     $question_content .= '</div>';
     $exercise_content .= $question_content;
@@ -892,12 +892,12 @@ 
 
 //Total score
 if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
-	if ($show_results || $show_only_total_score || $showTotalScoreAndUserChoices) {
+    if ($show_results || $show_only_total_score || $showTotalScoreAndUserChoices) {
         $total_score_text .= '<div class="question_row">';
         $my_total_score_temp = $totalScore;
-	    if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
-	        $my_total_score_temp = 0;
-	    }
+        if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
+            $my_total_score_temp = 0;
+        }
         $total_score_text .= ExerciseLib::get_question_ribbon(
             $objExercise,
             $my_total_score_temp,
@@ -905,7 +905,7 @@ 
             true
         );
         $total_score_text .= '</div>';
-	}
+    }
 }
 
 if (!empty($category_list) && ($show_results || $show_only_total_score || $showTotalScoreAndUserChoices)) {
@@ -929,26 +929,26 @@ 
 }
 
 if ($isFeedbackAllowed) {
-	if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
-		echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
-		echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
-		echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
-		echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
-		echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
-		echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
-	} else {
-		echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
-	}
-	if ($origin !='learnpath' && $origin!='student_progress') {
+    if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
+        echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
+        echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
+        echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
+        echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
+        echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
+        echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
+    } else {
+        echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
+    }
+    if ($origin !='learnpath' && $origin!='student_progress') {
         echo '<label><input type= "checkbox" name="send_notification"> '.get_lang('SendEmail').'</label>';
-		?>
+        ?>
         <br />
         <button type="submit" class="btn btn-primary" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');">
             <?php echo get_lang('CorrectTest'); ?>
         </button>
 		</form>
 		<?php
-	}
+    }
 }
 
 //Came from lpstats in a lp
@@ -965,21 +965,21 @@ 
 }
 
 if ($origin != 'learnpath') {
-	//we are not in learnpath tool
-	Display::display_footer();
+    //we are not in learnpath tool
+    Display::display_footer();
 } else {
-	if (!isset($_GET['fb_type'])) {
-		$lp_mode =  $_SESSION['lp_mode'];
-		$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
-		$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
-		echo '<script type="text/javascript">'.$href.'</script>';
-		// Record the results in the learning path, using the SCORM interface (API)
-		echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
-		echo '</body></html>';
-	} else {
-		Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
+    if (!isset($_GET['fb_type'])) {
+        $lp_mode =  $_SESSION['lp_mode'];
+        $url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
+        $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
+        echo '<script type="text/javascript">'.$href.'</script>';
+        // Record the results in the learning path, using the SCORM interface (API)
+        echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
+        echo '</body></html>';
+    } else {
+        Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
         echo '<br />';
-	}
+    }
 }
 
 // Destroying the session

main/inc/lib/exercise_show_functions.lib.php

Indentation +110 added lines, -110 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,21 +136,21 @@ 
                 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,
+    public static function display_oral_expression_answer(
+        $feedback_type,
+        $answer,
+        $id,
+        $questionId,
         $nano = null,
         $results_disabled = 0
     ) {
@@ -186,8 +186,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
@@ -196,7 +196,7 @@ 
      * @param int $resultsDisabled
      * @param int $orderColor
      */
-	public static function display_hotspot_answer(
+    public static function display_hotspot_answer(
         $feedback_type,
         $answerId,
         $answer,
@@ -219,7 +219,7 @@ 
             }
         }
 
-		$hotspot_colors = array(
+        $hotspot_colors = array(
             "", // $i starts from 1 on next loop (ugly fix)
             "#4271B5",
             "#FE8E16",
@@ -236,7 +236,7 @@ 
             "#F7BDE2"
         );
 
-		?>
+        ?>
 		<table class="data_table">
 		<tr>
             <td class="text-center" width="5%">
@@ -248,10 +248,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%">
@@ -259,29 +259,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,
@@ -309,14 +309,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); ?>
@@ -330,39 +330,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
@@ -415,7 +415,7 @@ 
         if (isset($new_options[$studentChoice])) {
             echo get_lang($new_options[$studentChoice]['name']);
         } else {
-        	echo '-';
+            echo '-';
         }
 
         ?>
@@ -423,7 +423,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']);
@@ -449,8 +449,8 @@ 
                 }
 
                 if ($hide_expected_answer) {
-				    $color = '';
-				}
+                    $color = '';
+                }
 
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
@@ -468,19 +468,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,
@@ -511,7 +511,7 @@ 
         <tr>
         <td width="5%">
         <?php
-		//Your choice
+        //Your choice
         $question = new MultipleAnswerCombinationTrueFalse();
         if (isset($question->options[$studentChoice])) {
             echo $question->options[$studentChoice];
@@ -522,7 +522,7 @@ 
         </td>
         <td width="5%">
         <?php
-		// Expected choice
+        // Expected choice
         if (!$hide_expected_answer) {
             if (isset($question->options[$answerCorrect])) {
                 echo $question->options[$answerCorrect];
@@ -547,7 +547,7 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }