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 - cosmetic changes.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 0159c7dd21
commit 4cd1a376f7
4 changed files with 126 additions and 99 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. 15
      main/admin/usergroup_export.php
  2. 58
      main/admin/usergroups.php
  3. 150
      main/inc/lib/model.lib.php
  4. 2
      main/inc/local.inc.php

15
main/admin/usergroup_export.php
Unescape View File

@ -8,7 +8,6 @@
*/
// name of the language file that needs to be included
$language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
@ -26,18 +25,18 @@ $interbreadcrumb[] = array ('url' => 'usergroups.php', 'name' => get_lang('Class
set_time_limit(0);
$form = new FormValidator('export_users');
$form->addElement('header', $tool_name);
$form->addElement('style_submit_button', 'submit',get_lang('Export'),'class="save"');
$form->addElement('header', $tool_name);
$form->addElement('style_submit_button', 'submit', get_lang('Export'), 'class="save"');
if ($form->validate()) {
$user_group = new UserGroup;
$header = array(array('name', 'description'));
$data = $user_group->get_all_for_export();
$data = array_merge($header, $data);
$filename = 'export_classes_'.api_get_local_time();
Export::export_table_csv($data,$filename);
$data = $user_group->get_all_for_export();
$data = array_merge($header, $data);
$filename = 'export_classes_'.api_get_local_time();
Export::export_table_csv($data, $filename);
exit;
}
Display :: display_header($tool_name);
$form->display();
Display :: display_footer();
Display::display_footer();

58
main/admin/usergroups.php
Unescape View File

@ -17,16 +17,16 @@ api_protect_admin_script(true);
//Add the JS needed to use the jqgrid
$htmlHeadXtra[] = api_get_jqgrid_js();
// setting breadcrumbs
$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
$action = $_GET['action'];
if ($action == 'add') {
$interbreadcrumb[]=array('url' => 'usergroups.php','name' => get_lang('Classes'));
$interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
$interbreadcrumb[] = array('url' => '#','name' => get_lang('Add'));
} elseif ($action == 'edit') {
$interbreadcrumb[]=array('url' => 'usergroups.php','name' => get_lang('Classes'));
$interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
$interbreadcrumb[] = array('url' => '#','name' => get_lang('Edit'));
} else {
$interbreadcrumb[]=array('url' => '#','name' => get_lang('Classes'));
$interbreadcrumb[] = array('url' => '#','name' => get_lang('Classes'));
}
// The header.
@ -35,29 +35,31 @@ Display::display_header($tool_name);
// Tool name
if (isset($_GET['action']) && $_GET['action'] == 'add') {
$tool = 'Add';
$interbreadcrumb[] = array ('url' => api_get_self(), 'name' => get_lang('Group'));
$interbreadcrumb[] = array('url' => api_get_self(), 'name' => get_lang('Group'));
}
if (isset($_GET['action']) && $_GET['action'] == 'editnote') {
$tool = 'Modify';
$interbreadcrumb[] = array ('url' => api_get_self(), 'name' => get_lang('Group'));
$interbreadcrumb[] = array('url' => api_get_self(), 'name' => get_lang('Group'));
}
//jqgrid will use this URL to do the selects
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_usergroups';
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_usergroups';
//The order is important you need to check the the $column variable in the model.ajax.php file
$columns = array(get_lang('Name'), get_lang('Users'), get_lang('Courses'), get_lang('Sessions'), get_lang('Actions'));
$columns = array(
get_lang('Name'), get_lang('Users'), get_lang('Courses'), get_lang('Sessions'), get_lang('Actions')
);
//Column config
$column_model = array(
array('name'=>'name', 'index'=>'name', 'width'=>'35', 'align'=>'left'),
//array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left'),
array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'),
array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'),
array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left','sortable'=>'false','formatter'=>'action_formatter'),
);
array('name'=>'name', 'index'=>'name', 'width'=>'35', 'align'=>'left'),
array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'),
array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'),
array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left','sortable'=>'false','formatter'=>'action_formatter'),
);
//Autowidth
$extra_params['autowidth'] = 'true';
//height auto
@ -65,19 +67,20 @@ $extra_params['height'] = 'auto';
//With this function we can add actions to the jgrid
$action_links = 'function action_formatter (cellvalue, options, rowObject) {
return \''
.' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/user_to_class.png" title="'.get_lang('SubscribeUsersToClass').'"></a>'
.' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/course_to_class.png" title="'.get_lang('SubscribeClassToCourses').'"></a>'
.' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/sessions_to_class.png" title="'.get_lang('SubscribeClassToSessions').'"></a>'
.' <a href="?action=edit&id=\'+options.rowId+\'"><img width="20px" src="../img/edit.png" title="'.get_lang('Edit').'" ></a>'
.' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?action=delete&id=\'+options.rowId+\'"><img title="'.get_lang('Delete').'" src="../img/delete.png"></a>\';
}';
return \''
.' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/user_to_class.png" title="'.get_lang('SubscribeUsersToClass').'"></a>'
.' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/course_to_class.png" title="'.get_lang('SubscribeClassToCourses').'"></a>'
.' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/sessions_to_class.png" title="'.get_lang('SubscribeClassToSessions').'"></a>'
.' <a href="?action=edit&id=\'+options.rowId+\'"><img width="20px" src="../img/edit.png" title="'.get_lang('Edit').'" ></a>'
.' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?action=delete&id=\'+options.rowId+\'"><img title="'.get_lang('Delete').'" src="../img/delete.png"></a>\';
}';
?>
<script>
$(function() {
<?php
// grid definition see the $usergroup>display() function
echo Display::grid_js('usergroups', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
echo Display::grid_js('usergroups', $url,$columns, $column_model, $extra_params, array(), $action_links, true);
?>
});
</script>
@ -129,8 +132,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'add') {
$form->setConstants(array('sec_token' => $token));
$form->display();
}
}// Action handling: Editing a note
elseif (isset($_GET['action']) && $_GET['action'] == 'edit' && is_numeric($_GET['id'])) {
} elseif (isset($_GET['action']) && $_GET['action'] == 'edit' && is_numeric($_GET['id'])) {
// Action handling: Editing a note
// Initialize the object
$form = new FormValidator('career', 'post', api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&id='.Security::remove_XSS($_GET['id']));
// Settting the form elements
@ -169,6 +172,7 @@ elseif (isset($_GET['action']) && $_GET['action'] == 'edit' && is_numeric($_GET[
$form->display();
}
}
// Action handling: deleting a note
elseif (isset($_GET['action']) && $_GET['action'] == 'delete' && is_numeric($_GET['id'])) {
$res = $usergroup->delete(Security::remove_XSS($_GET['id']));

150
main/inc/lib/model.lib.php
Unescape View File

@ -10,22 +10,22 @@
* @package chamilo.library
*/
class Model {
var $table;
var $columns;
var $required;
var $is_course_model =false;
// var $pk; some day this will be implemented
public function __construct() {
public $table;
public $columns;
public $required;
public $is_course_model =false;
public function __construct()
{
}
/**
* Useful finder - experimental akelos like only use in notification.lib.php send function
*/
public function find($type, $options = null) {
switch($type) {
public function find($type, $options = null)
{
switch ($type) {
case 'all':
return self::get_all($options);
break;
@ -33,49 +33,60 @@ class Model {
return self::get($type);
break;
}
}
}
/**
* Delets an item
* Deletes an item
*/
public function delete($id) {
if (empty($id) or $id != strval(intval($id))) { return false; }
$params = array('id = ?' => $id);
public function delete($id)
{
if (empty($id) or $id != strval(intval($id))) {
return false;
}
$params = array('id = ?' => $id);
if ($this->is_course_model) {
$course_id = api_get_course_int_id();
$params = array('id = ? AND c_id = ?' => array($id, $course_id));
}
// Database table definition
$result = Database :: delete($this->table,$params );
if ($result != 1){
$result = Database::delete($this->table, $params);
if ($result != 1) {
return false;
}
}
return true;
}
private function clean_parameters($params){
/**
* @param array $params
* @return array
*/
private function clean_parameters($params)
{
$clean_params = array();
if (!empty($params)) {
foreach($params as $key=>$value) {
foreach ($params as $key=>$value) {
if (in_array($key, $this->columns)) {
$clean_params[$key] = $value;
}
}
}
}
return $clean_params;
}
/**
* Displays the title + grid
*/
public function display() {
}
public function display() {
}
/**
* Gets an element
*/
public function get($id) {
if (empty($id)) { return array(); }
public function get($id)
{
if (empty($id)) {
return array();
}
$params = array('id = ?'=>intval($id));
if ($this->is_course_model) {
$course_id = api_get_course_int_id();
@ -84,27 +95,39 @@ class Model {
$result = Database::select('*',$this->table, array('where' => $params),'first');
return $result;
}
public function get_all($options = null) {
/**
* @param array $options
* @return array
*/
public function get_all($options = null)
{
return Database::select('*', $this->table, $options);
}
public function get_all_for_export($options = null) {
/**
* @param array $options
* @return array
*/
public function get_all_for_export($options = null)
{
return Database::select('name, description', $this->table, $options);
}
/**
* Get the count of elements
*/
public function get_count() {
public function get_count()
{
$row = Database::select('count(*) as count', $this->table, array('where' => array('parent_id = ?' => '0')),'first');
return $row['count'];
}
/**
* a little bit of javascript to display
*/
public function javascript() {
public function javascript()
{
}
/**
@ -116,15 +139,15 @@ class Model {
*/
public function save($params, $show_query = false) {
$params = $this->clean_parameters($params);
if ($this->is_course_model) {
if ($this->is_course_model) {
if (!isset($params['c_id']) || empty($params['c_id'])) {
$params['c_id'] = api_get_course_int_id();
}
}
if (!empty($this->required)) {
$require_ok = true;
$require_ok = true;
$kay_params = array_keys($params);
foreach ($this->required as $field) {
if (!in_array($field, $kay_params)) {
@ -132,56 +155,57 @@ class Model {
}
}
if (!$require_ok) {
return false;
return false;
}
}
if (in_array('created_at', $this->columns)) {
if (in_array('created_at', $this->columns)) {
$params['created_at'] = api_get_utc_datetime();
}
if (!empty($params)) {
$id = Database::insert($this->table, $params, $show_query);
if (is_numeric($id)){
$id = Database::insert($this->table, $params, $show_query);
if (is_numeric($id)) {
return $id;
}
}
return false;
}
/**
* Updates the obj in the database. The $params['id'] must exist in order to update a record
*
* @param array $values
* @return bool
*
*/
public function update($params) {
$params = $this->clean_parameters($params);
if ($this->is_course_model) {
public function update($params)
{
$params = $this->clean_parameters($params);
if ($this->is_course_model) {
if (!isset($params['c_id']) || empty($params['c_id'])) {
$params['c_id'] = api_get_course_int_id();
}
}
//If the class has the updated_at field we update the date
if (in_array('updated_at', $this->columns)) {
if (in_array('updated_at', $this->columns)) {
$params['updated_at'] = api_get_utc_datetime();
}
//If the class has the created_at field then we remove it
if (in_array('created_at', $this->columns)) {
unset($params['created_at']);
}
if (!empty($params) && !empty($params['id'])) {
$id = intval($params['id']);
unset($params['id']); //To not overwrite the id
unset($params['id']); //To not overwrite the id
if (is_numeric($id)) {
$result = Database::update($this->table, $params, array('id = ?'=>$id));
if ($result){
$result = Database::update($this->table, $params, array('id = ?'=>$id));
if ($result) {
return true;
}
}
}
}
}
return false;
}

2
main/inc/local.inc.php
Unescape View File

@ -1207,7 +1207,7 @@ if (api_get_setting('student_view_enabled') == "true") {
if (isset($_cid)) {
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$time = api_get_utc_datetime();
$sql="UPDATE $tbl_course SET last_visit= '$time' WHERE code='$_cid'";
$sql = "UPDATE $tbl_course SET last_visit= '$time' WHERE code='$_cid'";
Database::query($sql);
}

Write Preview
Loading…
Cancel
Save