chamilo / chamilo-lms

main/inc/lib/search/xapian/XapianQuery.php

Doc Comments +1 added lines

@@ -239,6 +239,7 @@
 /**
  * @author Isaac flores paz <florespaz@bidsoftperu.com>
  * @param String The xapian error message
+ * @param string $xapian_error_message
  * @return String The chamilo error message
  */
 function display_xapian_error($xapian_error_message) {

Braces +12 added lines, -6 removed lines

@@ -30,7 +30,8 @@ 
  * @param   int             $count_type     Number of items to retrieve
  * @return  array                           An array of nids corresponding to the results.
  */
-function xapian_query($query_string, $db = NULL, $start = 0, $length = 10, $extra = array(), $count_type = 0) {
+function xapian_query($query_string, $db = NULL, $start = 0, $length = 10, $extra = array(), $count_type = 0)
+{
 
     try {
         if (!is_object($db)) {
@@ -129,7 +130,8 @@ 
 /**
  * build a boolean query
  */
-function xapian_get_boolean_query($term) {
+function xapian_get_boolean_query($term)
+{
     return new XapianQuery($term);
 }
 
@@ -141,7 +143,8 @@ 
  * @param   XapianDatabase  $db     Xapian database to connect
  * @return  array
  */
-function xapian_get_all_terms($count = 0, $prefix, $db = NULL) {
+function xapian_get_all_terms($count = 0, $prefix, $db = NULL)
+{
     try {
         if (!is_object($db)) {
             $db = new XapianDatabase(XAPIAN_DB);
@@ -175,7 +178,8 @@ 
  * @param   XapianDocument  document searched
  * @return  array
  */
-function xapian_get_doc_terms($doc = NULL, $prefix) {
+function xapian_get_doc_terms($doc = NULL, $prefix)
+{
     try {
         if (!is_a($doc, 'XapianDocument')) {
             return;
@@ -210,7 +214,8 @@ 
  * @param string $op
  * @return XapianQuery query joined
  */
-function xapian_join_queries($query1, $query2 = NULL, $op = 'or') {
+function xapian_join_queries($query1, $query2 = NULL, $op = 'or')
+{
     // let decide how to join, avoiding include xapian.php outside
     switch ($op) {
         case 'or':
@@ -244,7 +249,8 @@ 
  * @param String The xapian error message
  * @return String The chamilo error message
  */
-function display_xapian_error($xapian_error_message) {
+function display_xapian_error($xapian_error_message)
+{
     $message = explode(':', $xapian_error_message);
     $type_error_message = $message[0];
     if ($type_error_message == 'DatabaseOpeningError') {

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
  * @param   int             $count_type     Number of items to retrieve
  * @return  array                           An array of nids corresponding to the results.
  */
-function xapian_query($query_string, $db = NULL, $start = 0, $length = 10, $extra = array(), $count_type = 0) {
+function xapian_query($query_string, $db = null, $start = 0, $length = 10, $extra = array(), $count_type = 0) {
 
     try {
         if (!is_object($db)) {
@@ -46,7 +46,7 @@ 
         }
 
 
-        $query = NULL;
+        $query = null;
         $enquire = new XapianEnquire($db);
 
         if (!empty($query_string)) {
@@ -122,7 +122,7 @@ 
         return array($count, $results);
     } catch (Exception $e) {
         display_xapian_error($e->getMessage());
-        return NULL;
+        return null;
     }
 }
 
@@ -141,7 +141,7 @@ 
  * @param   XapianDatabase  $db     Xapian database to connect
  * @return  array
  */
-function xapian_get_all_terms($count = 0, $prefix, $db = NULL) {
+function xapian_get_all_terms($count = 0, $prefix, $db = null) {
     try {
         if (!is_object($db)) {
             $db = new XapianDatabase(XAPIAN_DB);
@@ -165,7 +165,7 @@ 
         return $terms;
     } catch (Exception $e) {
         display_xapian_error($e->getMessage());
-        return NULL;
+        return null;
     }
 }
 
@@ -175,7 +175,7 @@ 
  * @param   XapianDocument  document searched
  * @return  array
  */
-function xapian_get_doc_terms($doc = NULL, $prefix) {
+function xapian_get_doc_terms($doc = null, $prefix) {
     try {
         if (!is_a($doc, 'XapianDocument')) {
             return;
@@ -198,7 +198,7 @@ 
         return $terms;
     } catch (Exception $e) {
         display_xapian_error($e->getMessage());
-        return NULL;
+        return null;
     }
 }
 
@@ -210,7 +210,7 @@ 
  * @param string $op
  * @return XapianQuery query joined
  */
-function xapian_join_queries($query1, $query2 = NULL, $op = 'or') {
+function xapian_join_queries($query1, $query2 = null, $op = 'or') {
     // let decide how to join, avoiding include xapian.php outside
     switch ($op) {
         case 'or':

main/inc/lib/SmsPluginLibraryInterface.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     /**
      * @param array $additionalParameters
      *
-     * @return mixed
+     * @return void
      */
     public function send($additionalParameters);
 

src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      * Set accessUrlId
      *
      * @param integer $accessUrlId
-     * @return AccessUrlRelSession
+     * @return AccessUrlRelCourseCategory
      */
     public function setAccessUrlId($accessUrlId)
     {

src/Chamilo/CoreBundle/Entity/ClassItem.php

Doc Comments +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
      * Set code
      *
      * @param string $code
-     * @return Class
+     * @return ClassItem
      */
     public function setCode($code)
     {
@@ -62,7 +62,7 @@ 
      * Set name
      *
      * @param string $name
-     * @return Class
+     * @return ClassItem
      */
     public function setName($name)
     {

src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php

Doc Comments +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
      * Set relationType
      *
      * @param integer $relationType
-     * @return GroupRelUser
+     * @return UsergroupRelUser
      */
     public function setRelationType($relationType)
     {

main/admin/course_user_import.php

Doc Comments +3 added lines, -1 removed lines

@@ -9,6 +9,7 @@ 
 
 /**
  * Validates the imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function validate_data($users_courses)
 {
@@ -65,6 +66,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function save_data($users_courses)
 {
@@ -133,7 +135,7 @@ 
 /**
  * Reads CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file)
 {

main/admin/course_user_import_by_email.php

Doc Comments +3 added lines, -1 removed lines

@@ -8,6 +8,7 @@ 
  */
 /**
  * Validates the imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function validate_data($users_courses)
 {
@@ -66,6 +67,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function save_data($users_courses)
 {
@@ -134,7 +136,7 @@ 
 /**
  * Reads CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file)
 {

main/admin/skills_import.php

Doc Comments +3 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
 /**
  * Validate the imported data.
- * @param $skills
+ * @param Ddeboer\DataImport\Reader\CsvReader $skills
  * @return array
  */
 function validate_data($skills)
@@ -50,6 +50,7 @@ 
 /**
  * Save the imported data
  * @param   array   List of users
+ * @param Ddeboer\DataImport\Reader\CsvReader $skills
  * @return  void
  * @uses global variable $inserted_in_course,
  * which returns the list of courses the user was inserted in
@@ -77,7 +78,7 @@ 
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All userinformation read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All userinformation read from the file
  */
 function parse_csv_data($file)
 {

Indentation +12 added lines, -12 removed lines

@@ -70,7 +70,7 @@ 
             $oskill = new Skill();
             $skill_id = $oskill->add($skill);
             $parents[$saved_id] = $skill_id;
-		}
+        }
     }
 }
 
@@ -81,12 +81,12 @@ 
  */
 function parse_csv_data($file)
 {
-	$skills = Import :: csvToArray($file);
-	foreach ($skills as $index => $skill) {
-		$skills[$index] = $skill;
-	}
+    $skills = Import :: csvToArray($file);
+    foreach ($skills as $index => $skill) {
+        $skills[$index] = $skill;
+    }
 
-	return $skills;
+    return $skills;
 }
 
 /**
@@ -94,7 +94,7 @@ 
  */
 function element_start($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $current_tag;
     switch ($data) {
@@ -111,7 +111,7 @@ 
  */
 function element_end($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $skills;
     global $current_value;
@@ -130,9 +130,9 @@ 
  */
 function character_data($parser, $data)
 {
-	$data = trim(api_utf8_decode($data));
-	global $current_value;
-	$current_value = $data;
+    $data = trim(api_utf8_decode($data));
+    global $current_value;
+    $current_value = $data;
 }
 
 /**
@@ -154,7 +154,7 @@ 
     xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
     xml_parser_free($parser);
 
-	return $skills;
+    return $skills;
 }
 
 $this_section = SECTION_PLATFORM_ADMIN;

main/admin/user_import.php

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All userinformation read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All userinformation read from the file
  */
 function parse_csv_data($file)
 {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -364,7 +364,7 @@
 $user_id_error = array();
 $error_message = '';
 
-if (isset($_POST['formSent']) && $_POST['formSent'] AND
+if (isset($_POST['formSent']) && $_POST['formSent'] and
     $_FILES['import_file']['size'] !== 0
 ) {
     $file_type = $_POST['file_type'];

Braces +8 added lines, -2 removed lines

@@ -535,8 +535,14 @@
 <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
 <blockquote>
 <pre>
-<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) echo implode(';', $list).';'; ?></span>Courses;ClassId;
-<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) {
+    echo implode(';', $list).';';
+}
+?></span>Courses;ClassId;
+<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
 </pre>
 </blockquote>
 <p><?php echo get_lang('XMLMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>