Minor - flint fixes

pull/2588/merge
Julio Montoya 8 years ago
parent a15168c466
commit f568a74a89
  1. 1
      main/admin/skill_translate.php
  2. 20
      main/extra/userInfoLib.php
  3. 8
      main/inc/lib/api.lib.php
  4. 2
      main/inc/lib/events.lib.php
  5. 16
      main/inc/lib/plugin.class.php
  6. 8
      main/inc/lib/usermanager.lib.php
  7. 2
      main/session/add_courses_to_session.php
  8. 1
      main/session/resume_session.php
  9. 1
      plugin/learning_calendar/LearningCalendarPlugin.php
  10. 4
      plugin/vchamilo/lib/Virtual.php
  11. 3
      src/Chamilo/CoreBundle/Component/Editor/Connector.php

@ -2,7 +2,6 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\Language;
use Chamilo\CoreBundle\Entity\Skill;

@ -301,10 +301,10 @@ function update_user_course_properties($user_id, $course_code, $properties, $hor
* @author - Hugues peeters <peeters@ipm.ucl.ac.be>
* @author - Christophe Gesche <gesche@ipm.ucl.ac.be>
*
* @param $definition_id
* @param $user_id
* @param $user_ip
* @param $content
* @param $definition_id
* @param $user_id
* @param $user_ip
* @param $content
*
* @return bool true if succeed, else boolean false
*/
@ -355,10 +355,10 @@ function fill_new_cat_content($definition_id, $user_id, $content = "", $user_ip
* @author - Hugues peeters <peeters@ipm.ucl.ac.be>
* @author - Christophe Gesche <gesche@ipm.ucl.ac.be>
*
* @param $definition_id
* @param $user_id
* @param $user_ip DEFAULT $REMOTE_ADDR
* @param $content if empty call delete the bloc
* @param $definition_id
* @param $user_id
* @param $user_ip DEFAULT $REMOTE_ADDR
* @param $content if empty call delete the bloc
*
* @return bool true if succeed, else boolean false
*/
@ -398,8 +398,8 @@ function edit_cat_content($definition_id, $user_id, $content = "", $user_ip = ""
* @author Hugues peeters <peeters@ipm.ucl.ac.be>
* @author Christophe Gesche <gesche@ipm.ucl.ac.be>
*
* @param $definition_id
* @param $user_id
* @param $definition_id
* @param $user_id
*
* @return bool true if succeed, else boolean false
*/

@ -1737,9 +1737,9 @@ function api_get_user_info_from_username($username = '')
WHERE username='".Database::escape_string($username)."'";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$result_array = Database::fetch_array($result);
$resultArray = Database::fetch_array($result);
return _api_format_user($result_array);
return _api_format_user($resultArray);
}
return false;
@ -1761,9 +1761,9 @@ function api_get_user_info_from_email($email = '')
WHERE email ='".Database::escape_string($email)."' LIMIT 1";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$result_array = Database::fetch_array($result);
$resultArray = Database::fetch_array($result);
return _api_format_user($result_array);
return _api_format_user($resultArray);
}
return false;

@ -475,7 +475,7 @@ class Event
* @param int Position
* @param int Exercise ID (from c_quiz)
* @param bool update results?
* @param $fileName string Filename (for audio answers - using nanogong)
* @param $fileName string Filename (for audio answers - using nanogong)
* @param int User ID The user who's going to get this score. Default value of null means "get from context".
* @param int Course ID (from the "id" column of course table). Default value of null means "get from context".
* @param int Session ID (from the session table). Default value of null means "get from context".

@ -920,6 +920,14 @@ class Plugin
return '';
}
/**
* @param bool $value
*/
public function setHasPersonalEvents($value)
{
$this->hasPersonalEvents = $value;
}
/**
* Add an link for a course tool.
*
@ -978,12 +986,4 @@ class Plugin
return $tool;
}
/**
* @param bool $value
*/
public function setHasPersonalEvents($value)
{
$this->hasPersonalEvents = $value;
}
}

@ -4099,8 +4099,8 @@ class UserManager
* @param int $field_id field id of the tag
*
* @return bool True if the tag was inserted or updated. False otherwise.
* The return value doesn't take into account *values* added to the tag.
* Only the creation/update of the tag field itself.
* The return value doesn't take into account *values* added to the tag.
* Only the creation/update of the tag field itself.
*/
public static function add_tag($tag, $user_id, $field_id)
{
@ -4345,7 +4345,7 @@ class UserManager
* Get extra filterable user fields (only type select).
*
* @return array Array of extra fields as [int => ['name' => ..., 'variable' => ..., 'data' => ...]] (
* or empty array if no extra field)
* or empty array if no extra field)
*/
public static function getExtraFilterableFields()
{
@ -4371,7 +4371,7 @@ class UserManager
* Get extra where clauses for finding users based on extra filterable user fields (type select).
*
* @return string With AND clauses based on user's ID which have the values to search in extra user fields
* (or empty if no extra field exists)
* (or empty if no extra field exists)
*/
public static function get_search_form_where_extra_fields()
{

@ -1,8 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* @package chamilo.admin
*

@ -2,7 +2,6 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Promotion;
use Chamilo\CoreBundle\Entity\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\Repository\SessionRepository;
use Chamilo\CoreBundle\Entity\SequenceResource;

@ -677,7 +677,6 @@ class LearningCalendarPlugin extends Plugin
}
if (empty($courseSessionConditionToString)) {
return 0;
}

@ -474,8 +474,8 @@ class Virtual
/**
* Backups a database for having a snapshot.
*
* @param $vchamilo object The Vchamilo object
* @param $outputfilerad string The output SQL file radical
* @param $vchamilo object The Vchamilo object
* @param $outputfilerad string The output SQL file radical
*
* @return bool if TRUE, dumping database was a success, otherwise FALSE
*/

@ -40,7 +40,8 @@ class Connector
/**
* Connector constructor.
*/
public function __construct() {
public function __construct()
{
$this->paths = [
'root_sys' => api_get_path(SYS_PATH),
'sys_root' => api_get_path(SYS_PATH), // just an alias

Loading…
Cancel
Save