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
1.9.x
Julio Montoya 11 years ago
parent c8e432ee56
commit 538d77461e
8 changed files with 119 additions and 113 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. 9
      main/inc/lib/diagnoser.lib.php
  2. 5
      main/inc/lib/extra_field_option.lib.php
  3. 17
      main/inc/lib/extra_field_value.lib.php
  4. 137
      main/inc/lib/glossary.lib.php
  5. 4
      main/inc/lib/gradebook.lib.php
  6. 37
      main/inc/lib/group_portal_manager.lib.php
  7. 11
      main/inc/lib/urlmanager.lib.php
  8. 12
      main/inc/lib/usermanager.lib.php

9
main/inc/lib/diagnoser.lib.php
Unescape View File

@ -1,9 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* * Class that is responsible for generating diagnostic information about the system
*
* Class Diagnoser
* Class that is responsible for generating diagnostic information about the system
*
* @package chamilo.diagnoser
* @author Ivan Tcholakov, 2008, initiall proposal and sample code.
@ -11,10 +10,6 @@
* @author Julio Montoya <gugli100@gmail.com>, 2010, port to chamilo 1.8.7, Some fixes
*
*/
/**
* Diagnoser class
* @package chamilo.diagnoser
*/
class Diagnoser
{
/**

5
main/inc/lib/extra_field_option.lib.php
Unescape View File

@ -1,9 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Declaration of the ExtraFieldOption class
*/
/**
* Class ExtraFieldOption
* Handles the extra fields for various objects (users, sessions, courses)
*/
class ExtraFieldOption extends Model

17
main/inc/lib/extra_field_value.lib.php
Unescape View File

@ -2,15 +2,12 @@
/* For licensing terms, see /license.txt */
/**
* Class ExtraFieldValue
* Declaration for the ExtraFieldValue class, managing the values in extra
* fields for any datatype
* fields for any data type
* @package chamilo.library
*
*/
/**
* Class managing the values in extra fields for any datatype
* @package chamilo.library.extrafields
*/
class ExtraFieldValue extends Model
{
public $type = null;
@ -504,8 +501,12 @@ class ExtraFieldValue extends Model
* @return mixed Give the ID if found, or false on failure or not found
* @assert (-1,-1) === false
*/
public function get_item_id_from_field_variable_and_field_value($field_variable, $field_value, $transform = false, $last = false)
{
public function get_item_id_from_field_variable_and_field_value(
$field_variable,
$field_value,
$transform = false,
$last = false
) {
$field_value = Database::escape_string($field_value);
$field_variable = Database::escape_string($field_variable);

137
main/inc/lib/glossary.lib.php
Unescape View File

@ -1,29 +1,29 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This library provides functions for the glossary tool.
* Include/require it in your code to use its functionality.
* @package chamilo.library
*/
/**
* Class
* Class GlossaryManager
* This library provides functions for the glossary tool.
* Include/require it in your code to use its functionality.
* @package chamilo.library
* @package chamilo.library
*/
class GlossaryManager {
class GlossaryManager
{
/**
* Get all glossary terms
* @author Isaac Flores <isaac.flores@dokeos.com>
* @return Array Contain glossary terms
*/
public static function get_glossary_terms () {
public static function get_glossary_terms ()
{
global $course;
$glossary_data = array();
$glossary_table = Database::get_course_table(TABLE_GLOSSARY);
$session_id = intval($session_id);
$sql_filter = api_get_session_condition($session_id);
$course_id = api_get_course_int_id();
$sql = "SELECT glossary_id as id, name, description FROM $glossary_table WHERE c_id = $course_id $sql_filter";
$rs = Database::query($sql);
while ($row = Database::fetch_array($rs)) {
@ -31,6 +31,7 @@ class GlossaryManager {
}
return $glossary_data;
}
/**
* Get glossary term by glossary id
* @author Isaac Flores <florespaz@bidsoftperu.com>
@ -50,20 +51,22 @@ class GlossaryManager {
return '';
}
}
/**
* Get glossary term by glossary id
* @author Isaac Flores <florespaz_isaac@hotmail.com>
* @param String The glossary term name
* @return String The glossary description
*/
public static function get_glossary_term_by_glossary_name ($glossary_name) {
public static function get_glossary_term_by_glossary_name ($glossary_name)
{
global $course;
$glossary_table = Database::get_course_table(TABLE_GLOSSARY);
$session_id = intval($session_id);
$course_id = api_get_course_int_id();
$sql_filter = api_get_session_condition($session_id);
$sql = 'SELECT description FROM '.$glossary_table.' WHERE c_id = '.$course_id.' AND name LIKE trim("'.Database::escape_string($glossary_name).'")'.$sql_filter;
$sql = 'SELECT description FROM '.$glossary_table.'
WHERE c_id = '.$course_id.' AND name LIKE trim("'.Database::escape_string($glossary_name).'")'.$sql_filter;
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$row = Database::fetch_array($rs);
@ -72,6 +75,7 @@ class GlossaryManager {
return '';
}
}
/**
* This functions stores the glossary in the database
*
@ -81,7 +85,8 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
function save_glossary($values, $message = true) {
function save_glossary($values, $message = true)
{
if (!is_array($values) or !isset($values['glossary_title'])) {
return false;
}
@ -131,12 +136,13 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
function update_glossary($values, $message = true) {
function update_glossary($values, $message = true)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
// check if the glossary term already exists
if (GlossaryManager::glossary_exists($values['glossary_title'],$values['glossary_id'])) {
// display the feedback message
@ -166,7 +172,8 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
function get_max_glossary_item() {
function get_max_glossary_item()
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
@ -192,7 +199,8 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
function glossary_exists($term,$not_id='') {
function glossary_exists($term,$not_id='')
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
@ -209,7 +217,7 @@ class GlossaryManager {
return false;
}
}
/**
* Get one specific glossary term data
*
@ -218,7 +226,8 @@ class GlossaryManager {
*
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
*/
static function get_glossary_information($glossary_id) {
static function get_glossary_information($glossary_id)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY);
@ -228,11 +237,11 @@ class GlossaryManager {
g.description as glossary_comment,
g.display_order as glossary_display_order,
ip.insert_date as insert_date,
ip.lastedit_date as update_date,
g.session_id
ip.lastedit_date as update_date,
g.session_id
FROM $t_glossary g, $t_item_propery ip
WHERE g.glossary_id = ip.ref AND
tool = '".TOOL_GLOSSARY."' AND
WHERE g.glossary_id = ip.ref AND
tool = '".TOOL_GLOSSARY."' AND
g.glossary_id = '".intval($glossary_id)."' AND
g.c_id = ".api_get_course_int_id()." AND
ip.c_id = ".api_get_course_int_id()."
@ -252,11 +261,12 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
function delete_glossary($glossary_id, $message = true) {
function delete_glossary($glossary_id, $message = true)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
if (empty($glossary_id)) { return false; }
$sql = "DELETE FROM $t_glossary WHERE c_id = $course_id AND glossary_id='".Database::escape_string($glossary_id)."'";
@ -281,7 +291,8 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
static function display_glossary($view = 'table') {
static function display_glossary($view = 'table')
{
// This function should always be called with the corresponding
// parameter for view type. Meanwhile, use this cheap trick.
if (empty($_SESSION['glossary_view'])) {
@ -289,18 +300,18 @@ class GlossaryManager {
}
// action links
echo '<div class="actions">';
if (api_is_allowed_to_edit(null,true)) {
echo '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add">'.Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'),'','32').'</a>';
}
echo '<a href="index.php?'.api_get_cidreq().'&action=export">'.Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'),'','32').'</a>';
if (api_is_allowed_to_edit(null,true)) {
echo '<a href="index.php?'.api_get_cidreq().'&action=import">'.Display::return_icon('import_csv.png',get_lang('ImportGlossary'),'','32').'</a>';
}
echo '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
if ((isset($_SESSION['glossary_view']) && $_SESSION['glossary_view'] == 'table') or (!isset($_SESSION['glossary_view']))){
echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.Display::return_icon('view_detailed.png',get_lang('ListView'),'','32').'</a>';
} else {
@ -311,8 +322,8 @@ class GlossaryManager {
$table = new SortableTable('glossary', array('GlossaryManager','get_number_glossary_terms'), array('GlossaryManager','get_glossary_data'),0);
//$table->set_header(0, '', false);
$table->set_header(0, get_lang('TermName'), true);
$table->set_header(1, get_lang('TermDefinition'), true);
if (api_is_allowed_to_edit(null,true)) {
$table->set_header(1, get_lang('TermDefinition'), true);
if (api_is_allowed_to_edit(null,true)) {
$table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
$table->set_column_filter(2, array('GlossaryManager','actions_filter'));
}
@ -329,9 +340,10 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
function display_glossary_list() {
function display_glossary_list()
{
$glossary_data = self::get_glossary_data(0,1000,0,'ASC');
foreach($glossary_data as $key=>$glossary_item) {
foreach($glossary_data as $key=>$glossary_item) {
echo '<div class="sectiontitle">'.$glossary_item[0].'</div>';
echo '<div class="sectioncomment">'.$glossary_item[1].'</div>';
if (api_is_allowed_to_edit(null,true)) {
@ -349,11 +361,12 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
static function get_number_glossary_terms($session_id=0) {
static function get_number_glossary_terms($session_id=0)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$session_id = intval($session_id);
$sql_filter = api_get_session_condition($session_id, true, true);
$sql = "SELECT count(glossary_id) as total FROM $t_glossary WHERE c_id = $course_id $sql_filter";
@ -376,7 +389,8 @@ class GlossaryManager {
* @author Julio Montoya fixing this function, adding intvals
* @version januari 2009, dokeos 1.8.6
*/
static function get_glossary_data($from, $number_of_items, $column, $direction) {
static function get_glossary_data($from, $number_of_items, $column, $direction)
{
global $_user;
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@ -394,20 +408,20 @@ class GlossaryManager {
$column = intval($column);
if (!in_array($direction,array('DESC', 'ASC'))) {
$direction = 'ASC';
}
}
$from = intval($from);
$number_of_items = intval($number_of_items);
$sql = "SELECT glossary.name as col0,
glossary.description as col1,
glossary.description as col1,
$col2
glossary.session_id as session_id
FROM $t_glossary glossary, $t_item_propery ip
WHERE glossary.glossary_id = ip.ref AND
WHERE glossary.glossary_id = ip.ref AND
tool = '".TOOL_GLOSSARY."' $condition_session AND
glossary.c_id = ".api_get_course_int_id()." AND
ip.c_id = ".api_get_course_int_id()."
ORDER BY col$column $direction
ORDER BY col$column $direction
LIMIT $from,$number_of_items";
$res = Database::query($sql);
@ -424,18 +438,19 @@ class GlossaryManager {
$array[1] = $data[1];
}
if (api_is_allowed_to_edit(null,true)) {
if (api_is_allowed_to_edit(null,true)) {
// Date treatment for timezones
/*if (!empty($data[2]) && $data[2] != '0000-00-00 00:00:00:') {
$array[2] = api_get_local_time($data[2], null, date_default_timezone_get());
}
if (!empty($data[3]) && $data[3] != '0000-00-00 00:00:00:') {
$array[3] = api_get_local_time($data[3], null, date_default_timezone_get());
}*/
}*/
$array[2] = $data[2];
}
$return[] = $array;
}
return $return;
}
@ -450,11 +465,12 @@ class GlossaryManager {
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6
*/
static function actions_filter($glossary_id, $url_params, $row) {
static function actions_filter($glossary_id, $url_params, $row)
{
$glossary_id = $row[2];
$return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
$glossary_data = GlossaryManager::get_glossary_information($glossary_id);
$glossary_data = GlossaryManager::get_glossary_information($glossary_id);
$glossary_term = $glossary_data['glossary_title'];
if (api_is_allowed_to_edit(null, true)) {
@ -464,7 +480,7 @@ class GlossaryManager {
$return = get_lang('EditionNotAvailableFromSession');
}
}
return $return;
}
@ -496,15 +512,15 @@ class GlossaryManager {
function reorder_glossary() {
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $t_glossary WHERE c_id = $course_id ORDER by display_order ASC";
$res = Database::query($sql);
$i = 1;
while ($data = Database::fetch_array($res)) {
$sql_reorder = "UPDATE $t_glossary SET display_order = $i
WHERE c_id = $course_id AND glossary_id = '".Database::escape_string($data['glossary_id'])."'";
Database::query($sql_reorder);
$sql = "UPDATE $t_glossary SET display_order = $i
WHERE c_id = $course_id AND glossary_id = '".Database::escape_string($data['glossary_id'])."'";
Database::query($sql);
$i++;
}
}
@ -547,13 +563,14 @@ class GlossaryManager {
}
$sql1 = "UPDATE $t_glossary SET display_order = '".Database::escape_string($next_display_order)."' WHERE c_id = $course_id AND glossary_id = '".Database::escape_string($current_id)."'";
$sql2 = "UPDATE $t_glossary SET display_order = '".Database::escape_string($current_display_order)."' WHERE c_id = $course_id AND glossary_id = '".Database::escape_string($next_id)."'";
$res = Database::query($sql1);
$res = Database::query($sql2);
Database::query($sql1);
Database::query($sql2);
if ($message)
Display::display_confirmation_message(get_lang('TermMoved'));
}
static function export_to_pdf() {
static function export_to_pdf()
{
$data = GlossaryManager::get_glossary_data(0, GlossaryManager::get_number_glossary_terms(api_get_session_id()), 0, 'ASC');
$html = '<html><body>';
$html .= '<h2>'.get_lang('Glossary').'</h2><hr><br><br>';
@ -564,8 +581,8 @@ class GlossaryManager {
}
$html .= '</body></html>';
$course_code = api_get_course_id();
$pdf = new PDF();
//$pdf->set_custom_header($title);
$pdf = new PDF();
//$pdf->set_custom_header($title);
/*$css_file = api_get_path(SYS_CODE_PATH).'css/print.css';
if (file_exists($css_file)) {
$css = @file_get_contents($css_file);

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

@ -3,8 +3,8 @@
/**
* Class Gradebook
* This class provides methods for the notebook management.
* Include/require it in your code to use its features.
* This class provides methods for the notebook management.
* Include/require it in your code to use its features.
* @package chamilo.library
*/
class Gradebook extends Model

37
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -1,15 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This library provides functions for the group management.
* Include/require it in your code to use its functionality.
* @author Julio Montoya <gugli100@gmail.com>
* @package chamilo.library
*/
/**
* Code
*/
// Group permissions
define('GROUP_PERMISSION_OPEN', '1');
define('GROUP_PERMISSION_CLOSED', '2');
@ -31,12 +22,14 @@ define('GROUP_IMAGE_SIZE_SMALL', 4);
define('GROUP_TITLE_LENGTH', 50);
/**
* Class
* @package chamilo.library
* Class GroupPortalManager
* This library provides functions for the group management.
* Include/require it in your code to use its functionality.
* @author Julio Montoya <gugli100@gmail.com>
* @package chamilo.library
*/
class GroupPortalManager
{
/**
* Creates a new group
*
@ -64,8 +57,10 @@ class GroupPortalManager
$id = Database::insert_id();
if ($id) {
event_system(LOG_GROUP_PORTAL_CREATED, LOG_GROUP_PORTAL_ID, $id);
return $id;
}
return false;
}
@ -120,6 +115,7 @@ class GroupPortalManager
// Delete group image
self::delete_group_picture($id);
event_system(LOG_GROUP_PORTAL_DELETED, LOG_GROUP_PORTAL_ID, $id);
return $result;
}
@ -314,13 +310,14 @@ class GroupPortalManager
}
}
}
return $toreturn;
}
/**
* Gets the tags from a given group
* @param int group id
* @param bool show group links or not
* @param int $group_id
* @param bool $show_tag_links show group links or not
*
*/
public static function get_group_tags($group_id, $show_tag_links = true)
@ -410,7 +407,7 @@ class GroupPortalManager
$num = intval($num);
}
// only show admins and readers
$where_relation_condition = " WHERE gu.relation_type IN ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."', '".GROUP_USER_PERMISSION_HRM."') ";
$where_relation_condition = " WHERE gu.relation_type IN ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."', '".GROUP_USER_PERMISSION_HRM."') ";
$sql = "SELECT DISTINCT count(user_id) as count, g.picture_uri, g.name, g.description, g.id
FROM $tbl_group g
INNER JOIN $table_group_rel_user gu
@ -624,8 +621,9 @@ class GroupPortalManager
/**
* Add a group of users into a group of URLs
* @author Julio Montoya
* @param array of user_ids
* @param array of url_ids
* @param array $user_list of user_ids
* @param array $group_list of url_ids
* @param string $relation_type
**/
public static function add_users_to_groups($user_list, $group_list, $relation_type = GROUP_USER_PERMISSION_READER)
{
@ -650,8 +648,8 @@ class GroupPortalManager
/**
* Deletes a group and user relationship
* @author Julio Montoya
* @param int user id
* @param int relation type (optional)
* @param int $group_id
* @param int $relation_type (optional)
* @return boolean true if success
* */
public static function delete_users($group_id, $relation_type = null)
@ -702,6 +700,7 @@ class GroupPortalManager
* @param int $user_id
* @param int $group_id
* @param int $relation_type
*
* @return bool
**/
public static function update_user_role($user_id, $group_id, $relation_type = GROUP_USER_PERMISSION_READER)

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

@ -1,13 +1,12 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This library provides functions for the access_url management.
* Include/require it in your code to use its functionality.
*
* @package chamilo.library
*/
/**
* Class UrlManager
* This library provides functions for the access_url management.
* Include/require it in your code to use its functionality.
*
* @package chamilo.library
*/
class UrlManager
{

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

@ -1,18 +1,14 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* Class UserManager
*
* This library provides functions for user management.
* Include/require it in your code to use its functionality.
* @package chamilo.library
* @author Julio Montoya <gugli100@gmail.com> Social network groups added 2009/12
*/
/**
* Code
*/
/**
* Class
* @package chamilo.include.user
*
*/
class UserManager
{

Write Preview
Loading…
Cancel
Save