Minor - fix merge 1.11.x

pull/3063/head
Julio Montoya 7 years ago
parent 5d45152666
commit fb37afef75
  1. 44
      main/inc/lib/course.lib.php
  2. 10
      main/inc/lib/usermanager.lib.php

@ -6786,48 +6786,4 @@ class CourseManager
$courseFieldValue = new ExtraFieldValue('course'); $courseFieldValue = new ExtraFieldValue('course');
$courseFieldValue->saveFieldValues($params); $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'];
}
} }

@ -6424,14 +6424,4 @@ SQL;
return $url; return $url;
} }
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'];
}
} }

Loading…
Cancel
Save