@@ -2574,8 +2574,8 @@ class DocumentManager {
play
pause
'.$extra_controls.'
-
- '.$progress.'
+
+ '.$progress.'
';
@@ -2682,30 +2682,30 @@ class DocumentManager {
//$condition_session = " AND (id_session = '$session_id' OR (id_session = '0' AND insert_date <= (SELECT creation_date FROM $tbl_course WHERE code = '".$course_info['code']."' )))";
$condition_session = " AND (id_session = '$session_id' OR id_session = '0' )";
-
+
$add_folder_filter = null;
if (!empty($filter_by_folder)) {
$add_folder_filter = " AND docs.path LIKE '".Database::escape_string($filter_by_folder)."%'";
}
-
+
$sql_doc = "SELECT last.visibility, docs.*
FROM $tbl_item_prop AS last, $tbl_doc AS docs
- WHERE docs.id = last.ref AND
- docs.path LIKE '".$path.$added_slash."%' AND
- docs.path NOT LIKE '%_DELETED_%' AND
+ WHERE docs.id = last.ref AND
+ docs.path LIKE '".$path.$added_slash."%' AND
+ docs.path NOT LIKE '%_DELETED_%' AND
last.tool = '".TOOL_DOCUMENT."' $condition_session AND
- last.visibility = '1' AND
- docs.c_id = {$course_info['real_id']} AND
- last.c_id = {$course_info['real_id']}
+ last.visibility = '1' AND
+ docs.c_id = {$course_info['real_id']} AND
+ last.c_id = {$course_info['real_id']}
$add_folder_filter
ORDER BY docs.title ASC";
-
+
$res_doc = Database::query($sql_doc);
$resources = Database::store_result($res_doc, 'ASSOC');
$resources_sorted = array();
$return = '';
-
+
if ($lp_id) {
$return .= '';
$return .= Display::return_icon('new_doc.gif', '', array(), ICON_SIZE_SMALL);
@@ -2913,7 +2913,7 @@ class DocumentManager {
$url = $web_code_path.'document/document.php?cidReq='.$course_info['code'].'&id_session='.$session_id.'&id='.$key;
if (!empty($overwrite_url)) {
$url = $overwrite_url.'&document_id='.$key;
- }
+ }
}
$img = $img_path.$icon;
if (!file_exists($img_sys_path.$icon)) {
@@ -3229,5 +3229,7 @@ class DocumentManager {
);
return $system_folders;
}
+
+
}
//end class DocumentManager
diff --git a/main/inc/lib/formvalidator/Element/html_editor.php b/main/inc/lib/formvalidator/Element/html_editor.php
index d7dde836be..7ca8014f27 100644
--- a/main/inc/lib/formvalidator/Element/html_editor.php
+++ b/main/inc/lib/formvalidator/Element/html_editor.php
@@ -3,7 +3,6 @@
/* For licensing terms, see /license.txt */
require_once 'HTML/QuickForm/textarea.php';
-require_once api_get_path(LIBRARY_PATH) . 'fckeditor/fckeditor.php';
/**
* A html editor field to use with QuickForm
@@ -106,7 +105,7 @@ class HTML_QuickForm_html_editor extends HTML_QuickForm_textarea {
if (!FCKeditor :: IsCompatible()) {
return parent::toHTML();
}
- $this->fck_editor->Value = $this->getValue();
+ $this->fck_editor->Value = $this->getValue();
$result = $this->fck_editor->CreateHtml();
//Add a link to open the allowed html tags window
//$result .= ''.get_lang('AllowedHTMLTags').'';
diff --git a/main/inc/lib/grade_model.lib.php b/main/inc/lib/grade_model.lib.php
index 6eff50674d..a4a464767f 100644
--- a/main/inc/lib/grade_model.lib.php
+++ b/main/inc/lib/grade_model.lib.php
@@ -12,121 +12,119 @@
* @package chamilo.library
*/
-require_once 'fckeditor/fckeditor.php';
-
class GradeModel extends Model {
-
+
var $table;
var $columns = array('id', 'name', 'description');
-
+
public function __construct() {
$this->table = Database::get_main_table(TABLE_GRADE_MODEL);
- }
-
+ }
+
public function get_all($where_conditions = array()) {
return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'name ASC'));
}
-
- public function get_count() {
+
+ public function get_count() {
$row = Database::select('count(*) as count', $this->table, array(),'first');
return $row['count'];
- }
-
+ }
+
/**
* Displays the title + grid
*/
public function display() {
// action links
echo '
';
+ echo Display::grid_html('grade_model');
}
-
+
/**
* Returns a Form validator Obj
* @todo the form should be auto generated
* @param string url
* @param string action add, edit
- * @return obj form validator obj
+ * @return obj form validator obj
*/
public function return_form($url, $action) {
-
+
$oFCKeditor = new FCKeditor('description') ;
$oFCKeditor->ToolbarSet = 'grade_model';
$oFCKeditor->Width = '100%';
$oFCKeditor->Height = '200';
$oFCKeditor->Value = '';
$oFCKeditor->CreateHtml();
-
+
$form = new FormValidator('grades', 'post', $url);
-
+
// Settting the form elements
$header = get_lang('Add');
-
+
if ($action == 'edit') {
$header = get_lang('Modify');
}
-
+
$form->addElement('header', $header);
$id = isset($_GET['id']) ? intval($_GET['id']) : '';
$form->addElement('hidden', 'id', $id);
-
+
$form->addElement('text', 'name', get_lang('Name'), array('size' => '70'));
- $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));
+ $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));
$form->addElement('label', get_lang('Components'));
-
+
//Get components
$nr_items = 2;
$max = 10;
-
+
// Setting the defaults
-
- $defaults = $this->get($id);
-
+
+ $defaults = $this->get($id);
+
$components = $this->get_components($defaults['id']);
-
+
if ($action == 'edit') {
- if (!empty($components)) {
+ if (!empty($components)) {
$nr_items = count($components) -1;
}
- }
-
+ }
+
$form->addElement('hidden', 'maxvalue', '100');
$form->addElement('hidden', 'minvalue', '0');
-
+
$renderer = & $form->defaultRenderer();
-
+
$component_array = array();
-
+
for ($i = 0; $i <= $max; $i++) {
$counter = $i;
- $form->addElement('text', 'components['.$i.'][percentage]', null, array('class' => 'span1'));
+ $form->addElement('text', 'components['.$i.'][percentage]', null, array('class' => 'span1'));
$form->addElement('text', 'components['.$i.'][acronym]', null, array('class' => 'span1', 'placeholder' => get_lang('Acronym')));
- $form->addElement('text', 'components['.$i.'][title]', null, array('class' => 'span2', 'placeholder' => get_lang('Title')));
+ $form->addElement('text', 'components['.$i.'][title]', null, array('class' => 'span2', 'placeholder' => get_lang('Title')));
$form->addElement('text', 'components['.$i.'][prefix]', null, array('class'=> 'span1', 'placeholder' => get_lang('Prefix')));
-
+
$options = array(0=>0, 1 => 1, 2 => 2, 3=>3, 4=> 4, 5=> 5);
$form->addElement('select', 'components['.$i.'][count_elements]', null, $options);
-
- $options = array(0=>0, 1 => 1, 2 => 2, 3=>3, 4=> 4, 5=> 5);
+
+ $options = array(0=>0, 1 => 1, 2 => 2, 3=>3, 4=> 4, 5=> 5);
$form->addElement('select', 'components['.$i.'][exclusions]', null, $options);
-
-
-
+
+
+
$form->addElement('hidden', 'components['.$i.'][id]');
-
+
$template_percentage =
- '';
- echo ''.Display::return_icon('back.png',get_lang('Back'),'','32').'';
- echo ''.Display::return_icon('add.png',get_lang('Add'),'','32').'';
- echo '
';
- echo Display::grid_html('grade_model');
+ echo ''.Display::return_icon('back.png',get_lang('Back'),'','32').'';
+ echo ''.Display::return_icon('add.png',get_lang('Add'),'','32').'';
+ echo '
+ '
-
+
';
-
+
$renderer->setElementTemplate($template_acronym, 'components['.$i.'][title]');
$renderer->setElementTemplate($template_percentage , 'components['.$i.'][percentage]');
$renderer->setElementTemplate($template_acronym , 'components['.$i.'][acronym]');
-
+
$renderer->setElementTemplate($template_acronym , 'components['.$i.'][prefix]');
$renderer->setElementTemplate($template_title , 'components['.$i.'][exclusions]');
$renderer->setElementTemplate($template_acronym , 'components['.$i.'][count_elements]');
-
+
if ($i == 0) {
$form->addRule('components['.$i.'][percentage]', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('components['.$i.'][title]', get_lang('ThisFieldIsRequired'), 'required');
- $form->addRule('components['.$i.'][acronym]', get_lang('ThisFieldIsRequired'), 'required');
+ $form->addRule('components['.$i.'][acronym]', get_lang('ThisFieldIsRequired'), 'required');
}
$form->addRule('components['.$i.'][percentage]', get_lang('OnlyNumbers'), 'numeric');
-
+
$form->addRule(array('components['.$i.'][percentage]', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
- $form->addRule(array('components['.$i.'][percentage]', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
-
+ $form->addRule(array('components['.$i.'][percentage]', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
+
$component_array[] = 'components['.$i.'][percentage]';
}
-
+
//New rule added in the formvalidator compare_fields that filters a group of fields in order to compare with the wanted value
- $form->addRule($component_array, get_lang('AllMustWeight100'), 'compare_fields', '==@100');
-
+ $form->addRule($component_array, get_lang('AllMustWeight100'), 'compare_fields', '==@100');
+
$form->addElement('advanced_settings', get_lang('AllMustWeight100'));
-
+
if ($action == 'edit') {
$form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
} else {
@@ -179,43 +177,43 @@ class GradeModel extends Model {
}
$counter++;
}
- }
-
+ }
+
$form->setDefaults($defaults);
-
+
// Setting the rules
- $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
- return $form;
+ $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
+ return $form;
}
-
- public function get_components($id) {
+
+ public function get_components($id) {
$obj = new GradeModelComponents();
if (!empty($id)) {
- return $obj->get_all(array('where'=> array('grade_model_id = ?' => $id)));
- }
+ return $obj->get_all(array('where'=> array('grade_model_id = ?' => $id)));
+ }
return null;
}
-
- public function save($params, $show_query = false) {
+
+ public function save($params, $show_query = false) {
$id = parent::save($params, $show_query);
- if (!empty($id)) {
- foreach ($params['components'] as $component) {
+ if (!empty($id)) {
+ foreach ($params['components'] as $component) {
if (!empty($component['title']) && !empty($component['percentage']) && !empty($component['acronym'])) {
$obj = new GradeModelComponents();
$component['grade_model_id'] = $id;
$obj->save($component);
}
- }
+ }
}
- //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+ //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
return $id;
}
-
+
public function update($params) {
parent::update($params);
-
+
if (!empty($params['id'])) {
- foreach ($params['components'] as $component) {
+ foreach ($params['components'] as $component) {
$obj = new GradeModelComponents();
$component['grade_model_id'] = $params['id'];
if (empty($component['title']) && empty($component['percentage']) && empty($component['acronym'])) {
@@ -224,41 +222,41 @@ class GradeModel extends Model {
$obj->update($component);
}
}
- }
+ }
//$params['components']
}
-
+
public function delete($id) {
parent::delete($id);
//event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
}
-
+
public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null) {
if (api_get_setting('gradebook_enable_grade_model') == 'false') {
return false;
- }
-
+ }
+
if (api_get_setting('teachers_can_change_grade_model_settings') == 'true' || api_is_platform_admin()) {
- $grade_models = $this->get_all();
- $grade_model_options = array('-1' => get_lang('None'));
+ $grade_models = $this->get_all();
+ $grade_model_options = array('-1' => get_lang('None'));
if (!empty($grade_models)) {
foreach ($grade_models as $item) {
$grade_model_options[$item['id']] = $item['name'];
- }
+ }
}
$form->addElement('select', $name, get_lang('GradeModel'), $grade_model_options);
$default_platform_setting = api_get_setting('gradebook_default_grade_model_id');
-
+
$default = -1;
-
+
if ($default_platform_setting == -1) {
if (!empty($default_value)) {
$default = $default_value;
- }
+ }
} else {
$default = $default_platform_setting;
}
-
+
if (!empty($default) && $default != '-1') {
$form->setDefaults(array($name => $default));
}
@@ -269,12 +267,12 @@ class GradeModel extends Model {
class GradeModelComponents extends Model {
var $table;
var $columns = array('id', 'title', 'percentage', 'acronym', 'grade_model_id', 'prefix', 'exclusions', 'count_elements');
-
+
public function __construct() {
$this->table = Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
- }
- public function save($params, $show_query = false) {
- $id = parent::save($params, $show_query);
+ }
+ public function save($params, $show_query = false) {
+ $id = parent::save($params, $show_query);
return $id;
}
}
\ No newline at end of file
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 877ab07fa8..70312287f7 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -357,6 +357,8 @@ define('MESSAGE_STATUS_INVITATION_PENDING', '5');
define('MESSAGE_STATUS_INVITATION_ACCEPTED', '6');
define('MESSAGE_STATUS_INVITATION_DENIED', '7');
+define('SESSION_LINK_TARGET', '_self');
+
/**
* Inclusion of internationalization libraries
diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index 141a4eb71c..90334973ee 100644
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -10,10 +10,8 @@
/**
* Code
*/
-define('SESSION_LINK_TARGET', '_self');
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
-require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
/**
* Class
{element} {error} % = ';
-
+
$template_acronym = '
-
+
{element} {label} {error} ';
$template_title =
@@ -136,35 +134,35 @@ class GradeModel extends Model {
-
+
-
+