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, fix php docs, fix variable names

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent dcd6ffee6a
commit 2ca2d64415
8 changed files with 236 additions and 192 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. 10
      main/exercise/export/scorm/scorm_classes.php
  2. 14
      main/gradebook/lib/be/abstractlink.class.php
  3. 26
      main/inc/lib/events.lib.php
  4. 34
      main/inc/lib/extra_field.lib.php
  5. 25
      main/inc/lib/pdf.lib.php
  6. 196
      main/inc/lib/urlmanager.lib.php
  7. 107
      plugin/sepe/database.php
  8. 16
      plugin/sepe/src/sepe_plugin.class.php

10
main/exercise/export/scorm/scorm_classes.php
Unescape View File

@ -28,7 +28,6 @@ class ScormQuestion extends Question
* @param int $js_id The JavaScript ID for this question.
* Due to the nature of interactions, we must have a natural sequence for
* questions in the generated JavaScript.
* @param integer $js_id
* @return string|array
*/
public static function export_question(
@ -122,6 +121,10 @@ class ScormQuestion extends Question
return true;
}
/**
* @return array
* @throws Exception
*/
public function export()
{
$html = $this->getQuestionHTML();
@ -384,8 +387,6 @@ class ScormAnswerFillInBlanks extends Answer
$html = '<tr><td colspan="2"><table width="100%">';
// get all enclosed answers
$blankList = array();
// build replacement
$replacementList = array();
foreach ($this->answer as $i => $answer) {
$blankList[] = '['.$answer.']';
}
@ -589,6 +590,7 @@ class ScormAnswerFree extends Answer
return array($js, $html);
}
}
/**
* This class handles the SCORM export of hotpot questions
* @package chamilo.exercise.scorm
@ -597,7 +599,7 @@ class ScormAnswerHotspot extends Answer
{
/**
* Returns the javascript code that goes with HotSpot exercises
* @return string The JavaScript code
* @return string The JavaScript code
*/
public function get_js_header()
{

14
main/gradebook/lib/be/abstractlink.class.php
Unescape View File

@ -459,7 +459,7 @@ abstract class AbstractLink implements GradebookItem
{
$table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
$dateobject = self::load($evaluationId, null, null, null, null);
$current_date_server = api_get_utc_datetime();
$now = api_get_utc_datetime();
$arreval = get_object_vars($dateobject[0]);
$description_log = isset($arreval['description']) ? $arreval['description'] : '';
if (empty($nameLog)) {
@ -478,7 +478,7 @@ abstract class AbstractLink implements GradebookItem
'id_linkeval_log' => $arreval['id'],
'name' => $name_log,
'description' => $description_log,
'created_at' => $current_date_server,
'created_at' => $now,
'weight' => $arreval['weight'],
'visible' => $arreval['visible'],
'type' => 'Link',
@ -493,8 +493,8 @@ abstract class AbstractLink implements GradebookItem
public function delete()
{
$this->delete_linked_data();
$tbl_grade_links = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql = 'DELETE FROM '.$tbl_grade_links.'
$table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql = 'DELETE FROM '.$table.'
WHERE id = '.intval($this->id);
Database::query($sql);
}
@ -510,8 +510,8 @@ abstract class AbstractLink implements GradebookItem
// links can only be moved to categories inside this course
$targets = array();
$level = 0;
$crscats = Category::load(null, null, $this->get_course_code(), 0);
foreach ($crscats as $cat) {
$categories = Category::load(null, null, $this->get_course_code(), 0);
foreach ($categories as $cat) {
$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
$targets = $this->addTargetSubcategories(
$targets,
@ -525,7 +525,9 @@ abstract class AbstractLink implements GradebookItem
/**
* Internal function used by get_target_categories()
* @param array $targets
* @param integer $level
* @param int $catid
* @return array
*/
private function addTargetSubcategories($targets, $level, $catid)

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

@ -114,14 +114,18 @@ class Event
} else {
$user_id = "0"; // no one
}
$sql = "INSERT INTO ".$TABLETRACK_ACCESS." (user_ip, access_user_id, c_id, access_date, access_session_id) VALUES
('".$ip."', ".$user_id.", '".$courseId."', '".$now."','".$id_session."')";
$sql = "INSERT INTO ".$TABLETRACK_ACCESS." (user_ip, access_user_id, c_id, access_date, access_session_id)
VALUES ('".$ip."', ".$user_id.", '".$courseId."', '".$now."','".$id_session."')";
Database::query($sql);
// added for "what's new" notification
$sql = "UPDATE $TABLETRACK_LASTACCESS SET access_date = '$now'
WHERE access_user_id = $user_id AND c_id = '$courseId' AND access_tool IS NULL AND access_session_id=".$id_session;
WHERE
access_user_id = $user_id AND
c_id = '$courseId' AND
access_tool IS NULL AND
access_session_id=".$id_session;
$result = Database::query($sql);
if (Database::affected_rows($result) == 0) {
@ -204,7 +208,7 @@ class Event
}
/**
* @param doc_id id of document (id in mainDb.document table)
* @param string $doc_url
* @author Sebastien Piraux <piraux_seb@hotmail.com>
* @desc Record information for download event
* (when an user click to d/l a document)
@ -283,7 +287,7 @@ class Event
}
/**
* @param link_id (id in coursDb liens table)
* @param int $link_id (id in coursDb liens table)
* @author Sebastien Piraux <piraux_seb@hotmail.com>
* @desc Record information for link event (when an user click on an added link)
* it will be used in a redirection page
@ -411,11 +415,11 @@ class Event
* @param integer Exercise ID (from c_quiz)
* @param bool update results?
* @param $fileName string Filename (for audio answers - using nanogong)
* @param integer User ID 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".
* @param integer Session ID (from the session table). Default value of null means "get from context".
* @param integer Learnpath ID (from c_lp table). Default value of null means "get from context".
* @param integer Learnpath item ID (from the c_lp_item table). Default value of null means "get from context".
* @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".
* @param int Learnpath ID (from c_lp table). Default value of null means "get from context".
* @param int Learnpath item ID (from the c_lp_item table). Default value of null means "get from context".
* @return boolean Result of the insert query
*/
public static function saveQuestionAttempt(
@ -759,7 +763,7 @@ class Event
/**
* Get every email stored in the database
*
* @deprecated
* @return array
* @assert () !== false
*/

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

@ -2212,13 +2212,13 @@ class ExtraField extends Model
<label for="geolocalization_extra_'.$field_details['variable'].'"
class="col-sm-2 control-label"></label>
<div class="col-sm-8">
<button class="null btn btn-default "
<button class="null btn btn-default"
id="geolocalization_extra_'.$field_details['variable'].'"
name="geolocalization_extra_'.$field_details['variable'].'"
type="submit">
<em class="fa fa-map-marker"></em> '.get_lang('Geolocalization').'
</button>
<button class="null btn btn-default " id="myLocation_extra_'.$field_details['variable'].'"
<button class="null btn btn-default" id="myLocation_extra_'.$field_details['variable'].'"
name="myLocation_extra_'.$field_details['variable'].'"
type="submit">
<em class="fa fa-crosshairs"></em> '.get_lang('MyLocation').'
@ -2465,18 +2465,22 @@ class ExtraField extends Model
{
// action links
echo '<div class="actions">';
echo '<a href="../admin/index.php">'.Display::return_icon(
'back.png',
get_lang('BackTo').' '.get_lang('PlatformAdmin'),
'',
ICON_SIZE_MEDIUM
).'</a>';
echo '<a href="'.api_get_self().'?action=add&type='.$this->type.'">'.Display::return_icon(
'add_user_fields.png',
get_lang('Add'),
'',
ICON_SIZE_MEDIUM
).'</a>';
echo '<a href="../admin/index.php">';
echo Display::return_icon(
'back.png',
get_lang('BackTo').' '.get_lang('PlatformAdmin'),
'',
ICON_SIZE_MEDIUM
);
echo '</a>';
echo '<a href="'.api_get_self().'?action=add&type='.$this->type.'">';
echo Display::return_icon(
'add_user_fields.png',
get_lang('Add'),
'',
ICON_SIZE_MEDIUM
);
echo '</a>';
echo '</div>';
echo Display::grid_html($this->type.'_fields');
}
@ -2922,7 +2926,6 @@ JAVASCRIPT;
}
$field_value_to_join = array();
//filter can be all/any = and/or
$inject_joins = null;
$inject_where = null;
@ -3359,6 +3362,7 @@ JAVASCRIPT;
/**
* @param string $from
* @param string $search
* @param array $options
*
* @return array
*/

25
main/inc/lib/pdf.lib.php
Unescape View File

@ -567,17 +567,22 @@ class PDF
public static function get_watermark($course_code = null)
{
$web_path = false;
$urlId = api_get_current_access_url_id();
if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
$course_info = api_get_course_info($course_code);
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
// course path
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.$urlId.'_pdf_watermark.png';
if (file_exists($store_path)) {
$web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
$web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.$urlId.'_pdf_watermark.png';
}
} else {
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
if (file_exists($store_path))
$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
// course path
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.$urlId.'_pdf_watermark.png';
if (file_exists($store_path)) {
$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.$urlId.'_pdf_watermark.png';
}
}
return $web_path;
}
@ -589,13 +594,14 @@ class PDF
*/
public function delete_watermark($course_code = null)
{
$urlId = api_get_current_access_url_id();
if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
$course_info = api_get_course_info($course_code);
// course path
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.$urlId.'_pdf_watermark.png';
} else {
// course path
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.$urlId.'_pdf_watermark.png';
}
if (file_exists($store_path)) {
unlink($store_path);
@ -613,15 +619,16 @@ class PDF
*/
public function upload_watermark($filename, $source_file, $course_code = null)
{
$urlId = api_get_current_access_url_id();
if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
$course_info = api_get_course_info($course_code);
$store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path
$web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png';
} else {
$store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path
$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.$urlId.'_pdf_watermark.png';
}
$course_image = $store_path.'/'.api_get_current_access_url_id().'_pdf_watermark.png';
$course_image = $store_path.'/'.$urlId.'_pdf_watermark.png';
if (file_exists($course_image)) {
@unlink($course_image);

196
main/inc/lib/urlmanager.lib.php
Unescape View File

@ -6,7 +6,7 @@
* This library provides functions for the access_url management.
* Include/require it in your code to use its functionality.
*
* @package chamilo.library
* @package chamilo.library
*/
class UrlManager
{
@ -39,15 +39,15 @@ class UrlManager
* Updates an URL access
* @author Julio Montoya <gugli100@gmail.com>,
*
* @param int $url_id The url id
* @param int $urlId The url id
* @param string $url
* @param string $description The description of the site
* @param int $active is active or not
* @return boolean if success
*/
public static function update($url_id, $url, $description, $active)
public static function update($urlId, $url, $description, $active)
{
$url_id = intval($url_id);
$urlId = intval($urlId);
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
$sql = "UPDATE $table
SET url = '".Database::escape_string($url)."',
@ -55,7 +55,7 @@ class UrlManager
active = '".intval($active)."',
created_by = '".api_get_user_id()."',
tms = '".api_get_utc_datetime()."'
WHERE id = '$url_id'";
WHERE id = '$urlId'";
$result = Database::query($sql);
@ -170,15 +170,15 @@ class UrlManager
/**
* Gets the id, url, description, and active status of ALL URLs
* @author Julio Montoya
* @param int $url_id
* @param int $urlId
* @return array
* */
public static function get_url_data_from_id($url_id)
public static function get_url_data_from_id($urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
$sql = "SELECT id, url, description, active
FROM $table
WHERE id = ".intval($url_id);
WHERE id = ".intval($urlId);
$res = Database::query($sql);
$row = Database::fetch_array($res);
@ -192,13 +192,13 @@ class UrlManager
* @param string $order_by
* @return array Database::store_result of the result
**/
public static function get_url_rel_user_data($access_url_id = null, $order_by = null)
public static function get_url_rel_user_data($urlId = 0, $order_by = null)
{
$where = '';
$table_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
if (!empty($access_url_id)) {
$where = "WHERE $table_url_rel_user.access_url_id = ".intval($access_url_id);
if (!empty($urlId)) {
$where = "WHERE $table_url_rel_user.access_url_id = ".intval($urlId);
}
if (empty($order_by)) {
$order_clause = api_sort_by_first_name(
@ -224,14 +224,14 @@ class UrlManager
* @param int access url id
* @return array Database::store_result of the result
**/
public static function get_url_rel_course_data($access_url_id = null)
public static function get_url_rel_course_data($urlId = 0)
{
$where = '';
$table_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
if (!empty($access_url_id)) {
$where = " WHERE uc.access_url_id = ".intval($access_url_id);
if (!empty($urlId)) {
$where = " WHERE uc.access_url_id = ".intval($urlId);
}
$sql = "SELECT u.id, c_id, title, uc.access_url_id
@ -269,19 +269,19 @@ class UrlManager
/**
* Gets the inner join of access_url and the session table
* @author Julio Montoya
* @param int $access_url_id access url id
* @param int $urlId access url id
*
* @return array Database::store_result of the result
*
**/
public static function get_url_rel_session_data($access_url_id = null)
public static function get_url_rel_session_data($urlId = 0)
{
$where = '';
$table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
if (!empty($access_url_id)) {
$where = "WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
if (!empty($urlId)) {
$where = "WHERE $table_url_rel_session.access_url_id = ".intval($urlId);
}
$sql = "SELECT id, name, access_url_id
@ -301,18 +301,18 @@ class UrlManager
* Gets the inner join of access_url and the usergroup table
*
* @author Julio Montoya
* @param int $access_url_id
* @param int $urlId
*
* @return array Database::store_result of the result
**/
public static function get_url_rel_usergroup_data($access_url_id = null)
public static function get_url_rel_usergroup_data($urlId = 0)
{
$where = '';
$table_url_rel_usergroup = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
$table_user_group = Database::get_main_table(TABLE_USERGROUP);
if (!empty($access_url_id)) {
$where = " WHERE $table_url_rel_usergroup.access_url_id = ".intval($access_url_id);
if (!empty($urlId)) {
$where = " WHERE $table_url_rel_usergroup.access_url_id = ".intval($urlId);
}
$sql = "SELECT u.id, u.name, access_url_id
@ -332,16 +332,16 @@ class UrlManager
* Gets the inner join of access_url and the usergroup table
*
* @author Julio Montoya
* @param int $access_url_id
* @param int $urlId
* @return array Database::store_result of the result
**/
public static function getUrlRelCourseCategory($access_url_id = null)
public static function getUrlRelCourseCategory($urlId = 0)
{
$table_url_rel = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
$table = Database::get_main_table(TABLE_MAIN_CATEGORY);
$where = " WHERE 1=1 ";
if (!empty($access_url_id)) {
$where .= " AND $table_url_rel.access_url_id = ".intval($access_url_id);
if (!empty($urlId)) {
$where .= " AND $table_url_rel.access_url_id = ".intval($urlId);
}
$where .= " AND (parent_id IS NULL) ";
@ -364,7 +364,7 @@ class UrlManager
* @param string $status lock || unlock
* @param int url id
* */
public static function set_url_status($status, $url_id)
public static function set_url_status($status, $urlId)
{
$url_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
if ($status == 'lock') {
@ -373,9 +373,9 @@ class UrlManager
if ($status == 'unlock') {
$status_db = '1';
}
if (($status_db == '1' || $status_db == '0') && is_numeric($url_id)) {
if (($status_db == '1' || $status_db == '0') && is_numeric($urlId)) {
$sql = "UPDATE $url_table SET active='".intval($status_db)."'
WHERE id='".intval($url_id)."'";
WHERE id='".intval($urlId)."'";
Database::query($sql);
}
}
@ -387,11 +387,11 @@ class UrlManager
* @param int url id
* @return boolean true if success
* */
public static function relation_url_user_exist($user_id, $url_id)
public static function relation_url_user_exist($user_id, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT user_id FROM $table
WHERE access_url_id = ".intval($url_id)." AND user_id = ".intval($user_id)." ";
WHERE access_url_id = ".intval($urlId)." AND user_id = ".intval($user_id)." ";
$result = Database::query($sql);
$num = Database::num_rows($result);
@ -446,14 +446,14 @@ class UrlManager
* @param int url id
* @return boolean true if success
* */
public static function relation_url_session_exist($session_id, $url_id)
public static function relation_url_session_exist($session_id, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$session_id = intval($session_id);
$url_id = intval($url_id);
$urlId = intval($urlId);
$sql = "SELECT session_id FROM $table
WHERE
access_url_id = ".intval($url_id)." AND
access_url_id = ".intval($urlId)." AND
session_id = ".Database::escape_string($session_id);
$result = Database::query($sql);
$num = Database::num_rows($result);
@ -474,19 +474,19 @@ class UrlManager
$result_array = array();
if (is_array($user_list) && is_array($url_list)) {
foreach ($url_list as $url_id) {
foreach ($url_list as $urlId) {
foreach ($user_list as $user_id) {
$count = self::relation_url_user_exist($user_id, $url_id);
$count = self::relation_url_user_exist($user_id, $urlId);
if ($count == 0) {
$sql = "INSERT INTO $table
SET
user_id = ".intval($user_id).",
access_url_id = ".intval($url_id);
access_url_id = ".intval($urlId);
$result = Database::query($sql);
if ($result) {
$result_array[$url_id][$user_id] = 1;
$result_array[$urlId][$user_id] = 1;
} else {
$result_array[$url_id][$user_id] = 0;
$result_array[$urlId][$user_id] = 0;
}
}
}
@ -510,20 +510,20 @@ class UrlManager
$result_array = array();
if (is_array($course_list) && is_array($url_list)) {
foreach ($url_list as $url_id) {
foreach ($url_list as $urlId) {
foreach ($course_list as $course_code) {
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['real_id'];
$count = self::relation_url_course_exist($courseId, $url_id);
$count = self::relation_url_course_exist($courseId, $urlId);
if ($count == 0) {
$sql = "INSERT INTO $table
SET c_id = '".$courseId."', access_url_id = ".intval($url_id);
SET c_id = '".$courseId."', access_url_id = ".intval($urlId);
$result = Database::query($sql);
if ($result) {
$result_array[$url_id][$course_code] = 1;
$result_array[$urlId][$course_code] = 1;
} else {
$result_array[$url_id][$course_code] = 0;
$result_array[$urlId][$course_code] = 0;
}
}
}
@ -668,20 +668,20 @@ class UrlManager
$result_array = array();
if (is_array($session_list) && is_array($url_list)) {
foreach ($url_list as $url_id) {
foreach ($url_list as $urlId) {
foreach ($session_list as $session_id) {
$count = self::relation_url_session_exist($session_id, $url_id);
$count = self::relation_url_session_exist($session_id, $urlId);
if ($count == 0) {
$sql = "INSERT INTO $table
SET
session_id = ".intval($session_id).",
access_url_id = ".intval($url_id);
access_url_id = ".intval($urlId);
$result = Database::query($sql);
if ($result) {
$result_array[$url_id][$session_id] = 1;
$result_array[$urlId][$session_id] = 1;
} else {
$result_array[$url_id][$session_id] = 0;
$result_array[$urlId][$session_id] = 0;
}
}
}
@ -695,21 +695,21 @@ class UrlManager
* Add a user into a url
* @author Julio Montoya
* @param int $user_id
* @param int $url_id
* @param int $urlId
*
* @return boolean true if success
* */
public static function add_user_to_url($user_id, $url_id = 1)
public static function add_user_to_url($user_id, $urlId = 1)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
if (empty($url_id)) {
$url_id = 1;
if (empty($urlId)) {
$urlId = 1;
}
$count = self::relation_url_user_exist($user_id, $url_id);
$count = self::relation_url_user_exist($user_id, $urlId);
$result = true;
if (empty($count)) {
$sql = "INSERT INTO $table (user_id, access_url_id)
VALUES ('".intval($user_id)."', '".intval($url_id)."') ";
VALUES ('".intval($user_id)."', '".intval($urlId)."') ";
$result = Database::query($sql);
}
@ -718,20 +718,20 @@ class UrlManager
/**
* @param int $courseId
* @param int $url_id
* @param int $urlId
*
* @return resource
*/
public static function add_course_to_url($courseId, $url_id = 1)
public static function add_course_to_url($courseId, $urlId = 1)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
if (empty($url_id)) {
$url_id = 1;
if (empty($urlId)) {
$urlId = 1;
}
$count = self::relation_url_course_exist($courseId, $url_id);
$count = self::relation_url_course_exist($courseId, $urlId);
if (empty($count)) {
$sql = "INSERT INTO $table
SET c_id = '".intval($courseId)."', access_url_id = ".intval($url_id);
SET c_id = '".intval($courseId)."', access_url_id = ".intval($urlId);
Database::query($sql);
}
@ -745,19 +745,19 @@ class UrlManager
*
* @return bool True on success, false session already exists or insert failed
*/
public static function add_session_to_url($session_id, $url_id = 1)
public static function add_session_to_url($session_id, $urlId = 1)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
if (empty($url_id)) {
$url_id = 1;
if (empty($urlId)) {
$urlId = 1;
}
$result = false;
$count = self::relation_url_session_exist($session_id, $url_id);
$count = self::relation_url_session_exist($session_id, $urlId);
$session_id = intval($session_id);
if (empty($count) && !empty($session_id)) {
$url_id = intval($url_id);
$urlId = intval($urlId);
$sql = "INSERT INTO $table
SET session_id = ".intval($session_id).", access_url_id = ".intval($url_id);
SET session_id = ".intval($session_id).", access_url_id = ".$urlId;
$result = Database::query($sql);
}
@ -772,15 +772,15 @@ class UrlManager
*
* @return boolean true if success
* */
public static function delete_url_rel_user($user_id, $url_id)
public static function delete_url_rel_user($user_id, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$result = true;
if (!empty($user_id) && !empty($url_id)) {
if (!empty($user_id) && !empty($urlId)) {
$sql = "DELETE FROM $table
WHERE
user_id = ".intval($user_id)." AND
access_url_id = ".intval($url_id);
access_url_id = ".intval($urlId);
$result = Database::query($sql);
}
@ -867,18 +867,18 @@ class UrlManager
/**
* Deletes an url and session relationship
* @author Julio Montoya
* @param char course code
* @param int url id
* @param int $session_id
* @param int $urlId
*
* @return boolean true if success
* */
public static function delete_url_rel_session($session_id, $url_id)
public static function delete_url_rel_session($session_id, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$sql = "DELETE FROM $table
WHERE
session_id = ".intval($session_id)." AND
access_url_id=".intval($url_id)." ";
access_url_id=".intval($urlId)." ";
$result = Database::query($sql, 'ASSOC');
return $result;
@ -888,15 +888,15 @@ class UrlManager
* Updates the access_url_rel_user table with a given user list
* @author Julio Montoya
* @param array $user_list
* @param int $access_url_id
* @param int $urlId
* @return bool|array
**/
public static function update_urls_rel_user($user_list, $access_url_id)
public static function update_urls_rel_user($user_list, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT user_id
FROM $table
WHERE access_url_id = ".intval($access_url_id);
WHERE access_url_id = ".intval($urlId);
$result = Database::query($sql);
$existing_users = array();
@ -909,7 +909,7 @@ class UrlManager
$users_added = array();
foreach ($user_list as $user_id_to_add) {
if (!in_array($user_id_to_add, $existing_users)) {
$result = self::add_user_to_url($user_id_to_add, $access_url_id);
$result = self::add_user_to_url($user_id_to_add, $urlId);
if ($result) {
$users_added[] = $user_id_to_add;
}
@ -920,7 +920,7 @@ class UrlManager
// Deleting old users
foreach ($existing_users as $user_id_to_delete) {
if (!in_array($user_id_to_delete, $user_list)) {
$result = self::delete_url_rel_user($user_id_to_delete, $access_url_id);
$result = self::delete_url_rel_user($user_id_to_delete, $urlId);
if ($result) {
$users_deleted[] = $user_id_to_delete;
}
@ -941,14 +941,14 @@ class UrlManager
* Updates the access_url_rel_course table with a given user list
* @author Julio Montoya
* @param array $course_list
* @param int $access_url_id
* @param int $urlId
* */
public static function update_urls_rel_course($course_list, $access_url_id)
public static function update_urls_rel_course($course_list, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql = "SELECT c_id FROM $table
WHERE access_url_id = ".intval($access_url_id);
WHERE access_url_id = ".intval($urlId);
$result = Database::query($sql);
$existing_courses = array();
@ -958,18 +958,18 @@ class UrlManager
// Adding courses
foreach ($course_list as $courseId) {
self::add_course_to_url($courseId, $access_url_id);
CourseManager::update_course_ranking($courseId, 0, $access_url_id);
self::add_course_to_url($courseId, $urlId);
CourseManager::update_course_ranking($courseId, 0, $urlId);
}
// Deleting old courses
foreach ($existing_courses as $courseId) {
if (!in_array($courseId, $course_list)) {
self::delete_url_rel_course($courseId, $access_url_id);
self::delete_url_rel_course($courseId, $urlId);
CourseManager::update_course_ranking(
$courseId,
0,
$access_url_id
$urlId
);
}
}
@ -1059,14 +1059,14 @@ class UrlManager
* Updates the access_url_rel_session table with a given user list
* @author Julio Montoya
* @param array $session_list
* @param int $access_url_id
* @param int $urlId
* */
public static function update_urls_rel_session($session_list, $access_url_id)
public static function update_urls_rel_session($session_list, $urlId)
{
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$sql = "SELECT session_id FROM $table
WHERE access_url_id=".intval($access_url_id);
WHERE access_url_id=".intval($urlId);
$result = Database::query($sql);
$existing_sessions = array();
@ -1077,8 +1077,8 @@ class UrlManager
// Adding users
foreach ($session_list as $session) {
if (!in_array($session, $existing_sessions)) {
if (!empty($session) && !empty($access_url_id)) {
self::add_session_to_url($session, $access_url_id);
if (!empty($session) && !empty($urlId)) {
self::add_session_to_url($session, $urlId);
}
}
}
@ -1086,10 +1086,10 @@ class UrlManager
// Deleting old users
foreach ($existing_sessions as $existing_session) {
if (!in_array($existing_session, $session_list)) {
if (!empty($existing_session) && !empty($access_url_id)) {
if (!empty($existing_session) && !empty($urlId)) {
self::delete_url_rel_session(
$existing_session,
$access_url_id
$urlId
);
}
}
@ -1136,10 +1136,10 @@ class UrlManager
}
/**
* @param $session_id
* @param $sessionId
* @return array
*/
public static function get_access_url_from_session($session_id)
public static function get_access_url_from_session($sessionId)
{
$table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$table_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
@ -1147,7 +1147,7 @@ class UrlManager
FROM $table_url_rel_session url_rel_session
INNER JOIN $table_url u
ON (url_rel_session.access_url_id = u.id)
WHERE session_id = ".intval($session_id);
WHERE session_id = ".intval($sessionId);
$result = Database::query($sql);
$url_list = Database::store_result($result);
@ -1164,9 +1164,9 @@ class UrlManager
$sql = "SELECT id FROM $table
WHERE url = '".Database::escape_string($url)."'";
$result = Database::query($sql);
$access_url_id = Database::result($result, 0, 0);
$urlId = Database::result($result, 0, 0);
return $access_url_id;
return $urlId;
}
/**

107
plugin/sepe/database.php
Unescape View File

@ -5,6 +5,7 @@
* inside another script loading global.inc.php
* @package chamilo.plugin.sepe
*/
/**
* Check if script can be called
*/
@ -50,7 +51,7 @@ $sepeActionsTable->addColumn(
'action_code',
\Doctrine\DBAL\Types\Type::STRING,
array('length' => 30)
);
);
$sepeActionsTable->addColumn(
'situation',
\Doctrine\DBAL\Types\Type::STRING,
@ -87,12 +88,12 @@ $sepeActionsTable->addColumn(
'financing_type',
\Doctrine\DBAL\Types\Type::STRING,
array('length' => 2)
);
);
$sepeActionsTable->addColumn(
'attendees_count',
\Doctrine\DBAL\Types\Type::INTEGER,
array('unsigned' => true)
);
);
$sepeActionsTable->addColumn(
'action_name',
\Doctrine\DBAL\Types\Type::STRING,
@ -108,7 +109,7 @@ $sepeActionsTable->setPrimaryKey(array('id'));
$sepeSpecialtyTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_SPECIALTY);
$sepeSpecialtyTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeSpecialtyTable->addColumn(
@ -125,7 +126,7 @@ $sepeSpecialtyTable->addColumn(
'professional_area',
\Doctrine\DBAL\Types\Type::STRING,
array('length' => 4)
);
);
$sepeSpecialtyTable->addColumn(
'specialty_code',
\Doctrine\DBAL\Types\Type::STRING,
@ -235,7 +236,7 @@ $sepeSpecialtyTable->addForeignKeyConstraint(
$sepeCentrosTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_CENTERS);
$sepeCentrosTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeCentrosTable->addColumn(
@ -254,9 +255,9 @@ $sepeCentrosTable->setPrimaryKey(array('id'));
$sepeSpecialtyClassroomTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_SPECIALTY_CLASSROOM);
$sepeSpecialtyClassroomTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
);
$sepeSpecialtyClassroomTable->addColumn(
'specialty_id',
\Doctrine\DBAL\Types\Type::INTEGER,
@ -275,11 +276,11 @@ $sepeSpecialtyClassroomTable->addForeignKeyConstraint(
array('onDelete' => 'CASCADE')
);
/* ========== PLUGIN_SEPE_TUTORS ========== */
/* ========== PLUGIN_SEPE_TUTORS ========== */
$sepeTutorsTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_TUTORS);
$sepeTutorsTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeTutorsTable->addColumn(
@ -328,12 +329,12 @@ $sepeTutorsTable->addColumn(
array('length' => 2)
);
$sepeTutorsTable->setPrimaryKey(array('id'));
/* ========== PLUGIN_SEPE_SPECIALTY_TUTORS ========== */
/* ========== PLUGIN_SEPE_SPECIALTY_TUTORS ========== */
$sepeSpecialtyTutorsTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_SPECIALTY_TUTORS);
$sepeSpecialtyTutorsTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeSpecialtyTutorsTable->addColumn(
@ -377,13 +378,13 @@ $sepeSpecialtyTutorsTable->addForeignKeyConstraint(
array('specialty_id'),
array('id'),
array('onDelete' => 'CASCADE')
);
);
/* ========== PLUGIN_SEPE_TUTORS_EMPRESA ========== */
$sepeTutorsCompanyTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_TUTORS_COMPANY);
$sepeTutorsCompanyTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeTutorsCompanyTable->addColumn(
@ -418,11 +419,11 @@ $sepeTutorsCompanyTable->addColumn(
);
$sepeTutorsCompanyTable->setPrimaryKey(array('id'));
/* ========== PLUGIN_SEPE_PARTICIPANTS ========== */
/* ========== PLUGIN_SEPE_PARTICIPANTS ========== */
$sepeParticipantsTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_PARTICIPANTS);
$sepeParticipantsTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeParticipantsTable->addColumn(
@ -481,25 +482,25 @@ $sepeParticipantsTable->addForeignKeyConstraint(
array('action_id'),
array('id'),
array('onDelete' => 'CASCADE')
);
);
$sepeParticipantsTable->addForeignKeyConstraint(
$sepeTutorsCompanyTable,
array('company_tutor_id'),
array('id'),
array('onDelete' => 'CASCADE')
);
);
$sepeParticipantsTable->addForeignKeyConstraint(
$sepeTutorsCompanyTable,
array('training_tutor_id'),
array('id'),
array('onDelete' => 'CASCADE')
);
);
/* ========== PLUGIN_SEPE_PARTICIPANTS_SPECIALTY ========== */
/* ========== PLUGIN_SEPE_PARTICIPANTS_SPECIALTY ========== */
$sepeParticipantsSpecialtyTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_PARTICIPANTS_SPECIALTY);
$sepeParticipantsSpecialtyTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeParticipantsSpecialtyTable->addColumn(
@ -523,12 +524,12 @@ $sepeParticipantsSpecialtyTable->addColumn(
array('length' => 14, 'notnull' => false)
);
$sepeParticipantsSpecialtyTable->addColumn(
'registration_date',
'registration_date',
\Doctrine\DBAL\Types\Type::DATE,
array('notnull' => false)
);
$sepeParticipantsSpecialtyTable->addColumn(
'leaving_date',
'leaving_date',
\Doctrine\DBAL\Types\Type::DATE,
array('notnull' => false)
);
@ -543,12 +544,12 @@ $sepeParticipantsSpecialtyTable->addColumn(
array('length' => 16, 'notnull' => false)
);
$sepeParticipantsSpecialtyTable->addColumn(
'start_date',
'start_date',
\Doctrine\DBAL\Types\Type::DATE,
array('notnull' => false)
);
$sepeParticipantsSpecialtyTable->addColumn(
'end_date',
'end_date',
\Doctrine\DBAL\Types\Type::DATE,
array('notnull' => false)
);
@ -573,13 +574,15 @@ $sepeParticipantsSpecialtyTable->addForeignKeyConstraint(
array('participant_id'),
array('id'),
array('onDelete' => 'CASCADE')
);
);
/* ========== PLUGIN_SEPE_PARTICIPANTS_SPECIALTY_TUTORIALS ========== */
$sepeParticipantsSpecialtyTutorialsTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_PARTICIPANTS_SPECIALTY_TUTORIALS);
/* ========== PLUGIN_SEPE_PARTICIPANTS_SPECIALTY_TUTORIALS ========== */
$sepeParticipantsSpecialtyTutorialsTable = $pluginSchema->createTable(
SepePlugin::TABLE_SEPE_PARTICIPANTS_SPECIALTY_TUTORIALS
);
$sepeParticipantsSpecialtyTutorialsTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeParticipantsSpecialtyTutorialsTable->addColumn(
@ -611,7 +614,7 @@ $sepeParticipantsSpecialtyTutorialsTable->addForeignKeyConstraint(
$sepeCourseActionsTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_COURSE_ACTIONS);
$sepeCourseActionsTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeCourseActionsTable->addColumn(
@ -636,7 +639,7 @@ $sepeCourseActionsTable->addForeignKeyConstraint(
$sepeTeachingCompetenceTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_TEACHING_COMPETENCE);
$sepeTeachingCompetenceTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeTeachingCompetenceTable->addColumn(
@ -651,7 +654,7 @@ $sepeTeachingCompetenceTable->setPrimaryKey(array('id'));
$sepeLogParticipantTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_LOG_PARTICIPANT);
$sepeLogParticipantTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeLogParticipantTable->addColumn(
@ -672,7 +675,7 @@ $sepeLogParticipantTable->setPrimaryKey(array('id'));
$sepeLogModParticipantTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_LOG_MOD_PARTICIPANT);
$sepeLogModParticipantTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeLogModParticipantTable->addColumn(
@ -692,7 +695,7 @@ $sepeLogModParticipantTable->setPrimaryKey(array('id'));
$sepeLogTable = $pluginSchema->createTable(SepePlugin::TABLE_SEPE_LOG);
$sepeLogTable->addColumn(
'id',
\Doctrine\DBAL\Types\Type::INTEGER,
\Doctrine\DBAL\Types\Type::INTEGER,
array('autoincrement' => true, 'unsigned' => true)
);
$sepeLogTable->addColumn(
@ -717,12 +720,32 @@ foreach ($queries as $query) {
//Insert data
$sepeTeachingCompetenceTable = Database::get_main_table(SepePlugin::TABLE_SEPE_TEACHING_COMPETENCE);
$competences = array(
array(1, '01', 'Certificado de profesionalidad de docencia de la formación profesional para el empleo regulado por Real Decreto 1697/2011, de 18 de noviembre.'),
array(
1,
'01',
'Certificado de profesionalidad de docencia de la formación profesional para el empleo regulado por Real Decreto 1697/2011, de 18 de noviembre.',
),
array(2, '02', 'Certificado de profesionalidad de formador ocupacional.'),
array(3, '03', 'Certificado de Aptitud Pedagógica o título profesional de Especialización Didáctica o Certificado de Cualificación Pedagógica.'),
array(4, '04', 'Máster Universitario habilitante para el ejercicio de las Profesiones reguladas de Profesor de Educación Secundaria Obligatoria y Bachillerato, Formación Profesional y Escuelas Oficiales de Idiomas.'),
array(5, '05', 'Curso de formación equivalente a la formación pedagógica y didáctica exigida para aquellas personas que, estando en posesion de una titulación declarada equivalente a efectos de docencia, no pueden realizar los estudios de máster, establecida en la disposición adicional primera del Real Decreto 1834/2008, de 8 de noviembre.'),
array(6, '06', 'Experiencia docente contrastada de al menos 600 horas de impartición de acciones formativas de formación profesional para el empleo o del sistema educativo en modalidad presencial, en los últimos diez años.')
array(
3,
'03',
'Certificado de Aptitud Pedagógica o título profesional de Especialización Didáctica o Certificado de Cualificación Pedagógica.',
),
array(
4,
'04',
'Máster Universitario habilitante para el ejercicio de las Profesiones reguladas de Profesor de Educación Secundaria Obligatoria y Bachillerato, Formación Profesional y Escuelas Oficiales de Idiomas.',
),
array(
5,
'05',
'Curso de formación equivalente a la formación pedagógica y didáctica exigida para aquellas personas que, estando en posesion de una titulación declarada equivalente a efectos de docencia, no pueden realizar los estudios de máster, establecida en la disposición adicional primera del Real Decreto 1834/2008, de 8 de noviembre.',
),
array(
6,
'06',
'Experiencia docente contrastada de al menos 600 horas de impartición de acciones formativas de formación profesional para el empleo o del sistema educativo en modalidad presencial, en los últimos diez años.',
),
);
foreach ($competences as $competence) {
@ -731,7 +754,7 @@ foreach ($competences as $competence) {
array(
'id' => $competence[0],
'code' => $competence[1],
'value' => $competence[2]
'value' => $competence[2],
)
);
}
@ -743,7 +766,7 @@ Database::insert(
'id' => 1,
'alias' => 'Sin tutor',
'company' => 'SI',
'training' => 'SI'
'training' => 'SI',
)
);

16
plugin/sepe/src/sepe_plugin.class.php
Unescape View File

@ -28,8 +28,7 @@ class SepePlugin extends Plugin
public $isAdminPlugin = true;
/**
*
* @return StaticPlugin
* @return SepePlugin
*/
public static function create()
{
@ -40,11 +39,11 @@ class SepePlugin extends Plugin
protected function __construct()
{
parent::__construct(
'2.0',
'2.0',
'
Jose Angel Ruiz - NoSoloRed (original author) <br>
Julio Montoya (SOAP integration)
',
',
array('sepe_enable' => 'boolean')
);
}
@ -52,7 +51,7 @@ class SepePlugin extends Plugin
/**
* This method creates the tables required to this plugin
*/
function install()
public function install()
{
$tablesToBeCompared = array(
self::TABLE_SEPE_CENTER,
@ -87,7 +86,7 @@ class SepePlugin extends Plugin
/**
* This method drops the plugin tables
*/
function uninstall()
public function uninstall()
{
$tablesToBeDeleted = array(
self::TABLE_SEPE_CENTER,
@ -116,7 +115,10 @@ class SepePlugin extends Plugin
$this->manageTab(false);
}
function update()
/**
* @throws \Doctrine\DBAL\DBALException
*/
public function update()
{
$oldTableCenters = 'plugin_sepe_centros';
$oldTableTutorsCompany = 'plugin_sepe_tutors_empresa';

Write Preview
Loading…
Cancel
Save