From e21432f003e2fffcab0c9e5ade7705f9bc91266c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 12 Jun 2013 17:10:16 +0200
Subject: [PATCH] Minor - fixing URL, cosmetic changes

---
 main/inc/lib/events.lib.inc.php                |  2 +-
 .../Controller/ExerciseController.php          |  2 +-
 .../Controller/ModelAjaxController.php         | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php
index d427d7bbfb..f28e657fcd 100644
--- a/main/inc/lib/events.lib.inc.php
+++ b/main/inc/lib/events.lib.inc.php
@@ -430,7 +430,7 @@ function createEventExercise($exo_id)
  * @param	integer	Question ID
  * @param	integer Exercise ID
  * @param	integer	Position
- * @param	integer	Exercise ID (from c_quiz)
+ * @param	integer Exercise attempt ID (from track_e_exercise)
  * @param	string  Filename (for audio answers - using nanogong)
  * @param	integer ID of the user who's going to get this score. Default value of null means "get from context".
  * @param	integer	Course ID (from the "id" column of course table). Default value of null means "get from context".
diff --git a/src/ChamiloLMS/Controller/ExerciseController.php b/src/ChamiloLMS/Controller/ExerciseController.php
index 58851ad8a7..b698e007d9 100644
--- a/src/ChamiloLMS/Controller/ExerciseController.php
+++ b/src/ChamiloLMS/Controller/ExerciseController.php
@@ -129,7 +129,7 @@ class ExerciseController extends CommonController
                 array(
                     'name' => get_lang('Exercise'),
                     'url' => array(
-                        'uri' => api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&exerciseId'.$exerciseId
+                        'uri' => api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&exerciseId='.$exerciseId
                     )
                 ),
                 array(
diff --git a/src/ChamiloLMS/Controller/ModelAjaxController.php b/src/ChamiloLMS/Controller/ModelAjaxController.php
index 8776d07c97..8f77b95e60 100644
--- a/src/ChamiloLMS/Controller/ModelAjaxController.php
+++ b/src/ChamiloLMS/Controller/ModelAjaxController.php
@@ -37,7 +37,7 @@ class ModelAjaxController
      * @param $val
      * @return string
      */
-    function getWhereClause($col, $oper, $val)
+    private function getWhereClause($col, $oper, $val)
     {
 
         if (empty($col)) {
@@ -113,12 +113,14 @@ class ModelAjaxController
         }
 
         // Search features.
-        $where_condition = ""; //if there is no search request sent by jqgrid, $where should be empty
+
+        // If there is no search request sent by jqgrid, $where should be empty.
+        $where_condition = "";
         $operation       = $request->get('oper');
-        $export_format   = $request->get('export_format');// isset($_REQUEST['export_format'])  ? $_REQUEST['export_format']  : 'csv';
-        $search_field    = $request->get('searchField'); //isset($_REQUEST['searchField'])  ? $_REQUEST['searchField']  : false;
-        $search_oper     = $request->get('searchOper'); //isset($_REQUEST['searchOper'])   ? $_REQUEST['searchOper']   : false;
-        $search_string   = $request->get('searchString'); //isset($_REQUEST['searchString']) ? $_REQUEST['searchString'] : false;
+        $export_format   = $request->get('export_format');
+        $search_field    = $request->get('searchField');
+        $search_oper     = $request->get('searchOper');
+        $search_string   = $request->get('searchString');
         $isSearch        = $request->get('_search');
         $filters         = $request->get('filters');
         $type            = $request->get('type');
@@ -160,7 +162,7 @@ class ModelAjaxController
                     $where_condition .= ' ) ';
                 }
 
-                // Question field
+                // Question field.
 
                 $resultQuestion = $extraField->getExtraFieldRules($filters, 'question_');
                 $questionFields = $resultQuestion['extra_fields'];
@@ -188,7 +190,7 @@ class ModelAjaxController
             case 'get_questions':
                 $categoryId = $request->get('categoryId');
                 $exerciseId = $request->get('exerciseId');
-                $courseId = $request->get('courseId'); //isset($_REQUEST['courseId']) ? $_REQUEST['courseId'] : null;
+                $courseId = $request->get('courseId');
                 $count = \Question::getQuestions(
                     $app,
                     $categoryId,