chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code

Browse Source
pull/2624/head
Julio Montoya 7 years ago
parent fb8cb161fd
commit 2237e9ac6e
7 changed files with 105 additions and 105 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/auth/inscription.php
  2. 88
      main/inc/lib/course.lib.php
  3. 86
      main/inc/lib/document.lib.php
  4. 4
      main/inc/lib/extra_field.lib.php
  5. 26
      main/inc/lib/usermanager.lib.php
  6. 2
      src/Chamilo/CoreBundle/Entity/ExtraField.php
  7. 2
      src/Chamilo/UserBundle/Repository/UserRepository.php

2
main/auth/inscription.php
Unescape View File

@ -540,7 +540,7 @@ if (api_get_setting('allow_terms_conditions') === 'true' && $user_already_regist
$values = $termExtraFields->getAllValuesByItem($term_preview['id']);
foreach ($values as $value) {
//if ($value['variable'] === 'category') {
$form->addLabel($value['display_text'], $value['value']);
$form->addLabel($value['display_text'], $value['value']);
//}
}

88
main/inc/lib/course.lib.php
Unescape View File

@ -6675,6 +6675,50 @@ class CourseManager
return api_get_path(WEB_COURSE_PATH).$course->getDirectory().'/course-pic85x85.png';
}
/**
* @return int
*/
public static function getCountOpenCourses()
{
$visibility = [
COURSE_VISIBILITY_REGISTERED,
COURSE_VISIBILITY_OPEN_PLATFORM,
COURSE_VISIBILITY_OPEN_WORLD,
];
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$sql = "SELECT count(id) count
FROM $table
WHERE visibility IN (".implode(',', $visibility).")";
$result = Database::query($sql);
$row = Database::fetch_array($result);
return (int) $row['count'];
}
/**
* @return int
*/
public static function getCountExercisesFromOpenCourse()
{
$visibility = [
COURSE_VISIBILITY_REGISTERED,
COURSE_VISIBILITY_OPEN_PLATFORM,
COURSE_VISIBILITY_OPEN_WORLD,
];
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$tableExercise = Database::get_course_table(TABLE_QUIZ_TEST);
$sql = "SELECT count(e.iid) count
FROM $table c INNER JOIN $tableExercise e
ON (c.id = e.c_id)
WHERE e.active <> -1 AND visibility IN (".implode(',', $visibility).")";
$result = Database::query($sql);
$row = Database::fetch_array($result);
return (int) $row['count'];
}
/**
* Check if a specific access-url-related setting is a problem or not.
*
@ -6742,48 +6786,4 @@ class CourseManager
$courseFieldValue = new ExtraFieldValue('course');
$courseFieldValue->saveFieldValues($params);
}
/**
* @return int
*/
public static function getCountOpenCourses()
{
$visibility = [
COURSE_VISIBILITY_REGISTERED,
COURSE_VISIBILITY_OPEN_PLATFORM,
COURSE_VISIBILITY_OPEN_WORLD,
];
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$sql = "SELECT count(id) count
FROM $table
WHERE visibility IN (".implode(',', $visibility).")";
$result = Database::query($sql);
$row = Database::fetch_array($result);
return (int) $row['count'];
}
/**
* @return int
*/
public static function getCountExercisesFromOpenCourse()
{
$visibility = [
COURSE_VISIBILITY_REGISTERED,
COURSE_VISIBILITY_OPEN_PLATFORM,
COURSE_VISIBILITY_OPEN_WORLD,
];
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$tableExercise = Database::get_course_table(TABLE_QUIZ_TEST);
$sql = "SELECT count(e.iid) count
FROM $table c INNER JOIN $tableExercise e
ON (c.id = e.c_id)
WHERE e.active <> -1 AND visibility IN (".implode(',', $visibility).")";
$result = Database::query($sql);
$row = Database::fetch_array($result);
return (int) $row['count'];
}
}

86
main/inc/lib/document.lib.php
Unescape View File

@ -6400,6 +6400,49 @@ class DocumentManager
];
}
/**
* @param int $userId
*
* @return array Example [ 0 => ['code' => 'ABC', 'directory' => 'ABC0', 'path' => '/images/gallery/test.png', 'code_path' => 'ABC:/images/gallery/test.png'], 1 => ...]
*/
public static function getAllDocumentsCreatedByUser($userId)
{
$tblItemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tblDocument = Database::get_course_table(TABLE_DOCUMENT);
$tblCourse = Database::get_main_table(TABLE_MAIN_COURSE);
$userId = (int) $userId;
$sql = "SELECT DISTINCT c.code, c.directory, docs.path
FROM $tblItemProperty AS last
INNER JOIN $tblDocument AS docs
ON (
docs.id = last.ref AND
docs.c_id = last.c_id AND
docs.filetype <> 'folder'
)
INNER JOIN $tblCourse as c
ON (
docs.c_id = c.id
)
WHERE
last.tool = '".TOOL_DOCUMENT."' AND
last.insert_user_id = $userId AND
docs.path NOT LIKE '%_DELETED_%'
ORDER BY c.directory, docs.path
";
$result = Database::query($sql);
$list = [];
if (Database::num_rows($result) != 0) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
$row['code_path'] = $row['code'].':'.$row['path'];
$list[] = $row;
}
}
return $list;
}
/**
* Parse file information into a link.
*
@ -6826,47 +6869,4 @@ class DocumentManager
return $btn;
}
/**
* @param int $userId
*
* @return array Example [ 0 => ['code' => 'ABC', 'directory' => 'ABC0', 'path' => '/images/gallery/test.png', 'code_path' => 'ABC:/images/gallery/test.png'], 1 => ...]
*/
public static function getAllDocumentsCreatedByUser($userId)
{
$tblItemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tblDocument = Database::get_course_table(TABLE_DOCUMENT);
$tblCourse = Database::get_main_table(TABLE_MAIN_COURSE);
$userId = (int) $userId;
$sql = "SELECT DISTINCT c.code, c.directory, docs.path
FROM $tblItemProperty AS last
INNER JOIN $tblDocument AS docs
ON (
docs.id = last.ref AND
docs.c_id = last.c_id AND
docs.filetype <> 'folder'
)
INNER JOIN $tblCourse as c
ON (
docs.c_id = c.id
)
WHERE
last.tool = '".TOOL_DOCUMENT."' AND
last.insert_user_id = $userId AND
docs.path NOT LIKE '%_DELETED_%'
ORDER BY c.directory, docs.path
";
$result = Database::query($sql);
$list = [];
if (Database::num_rows($result) != 0) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
$row['code_path'] = $row['code'].':'.$row['path'];
$list[] = $row;
}
}
return $list;
}
}

4
main/inc/lib/extra_field.lib.php
Unescape View File

@ -179,7 +179,7 @@ class ExtraField extends Model
'career',
'user_certificate',
'survey',
'terms_and_condition'
'terms_and_condition',
];
if (api_get_configuration_value('allow_scheduled_announcements')) {
@ -480,7 +480,7 @@ class ExtraField extends Model
* @throws Exception
*
* @return array|bool If relevant, returns a one-element array with JS code to be added to the page HTML headers.
* Returns false if the form object was not given
* Returns false if the form object was not given
*/
public function addElements(
$form,

26
main/inc/lib/usermanager.lib.php
Unescape View File

@ -6311,6 +6311,19 @@ SQL;
}
}
/**
* @return int
*/
public static function getCountActiveUsers()
{
$table = Database::get_main_table(TABLE_MAIN_USER);
$sql = "SELECT count(id) count FROM $table WHERE active = 1 AND status <> ".ANONYMOUS;
$result = Database::query($sql);
$row = Database::fetch_array($result);
return (int) $row['count'];
}
/**
* @return EncoderFactory
*/
@ -6408,17 +6421,4 @@ SQL;
return $url;
}
/**
* @return int
*/
public static function getCountActiveUsers()
{
$table = Database::get_main_table(TABLE_MAIN_USER);
$sql = "SELECT count(id) count FROM $table WHERE active = 1 AND status <> ".ANONYMOUS;
$result = Database::query($sql);
$row = Database::fetch_array($result);
return (int)$row['count'];
}
}

2
src/Chamilo/CoreBundle/Entity/ExtraField.php
Unescape View File

@ -30,7 +30,7 @@ class ExtraField extends BaseAttribute
const USER_CERTIFICATE = 11;
const SURVEY_FIELD_TYPE = 12;
const SCHEDULED_ANNOUNCEMENT = 13;
const TERMS_AND_CONDITION_TYPE= 14;
const TERMS_AND_CONDITION_TYPE = 14;
/**
* @var int

2
src/Chamilo/UserBundle/Repository/UserRepository.php
Unescape View File

@ -512,7 +512,7 @@ class UserRepository extends EntityRepository
}
$agenda = new \Agenda('personal');
$events = $agenda->getEvents('', '', null, null, $userId, 'array');
$events = $agenda->getEvents('', '', null, null, $userId, 'array');
$eventList = [];
if (!empty($events)) {
foreach ($events as $event) {

Write Preview
Loading…
Cancel
Save