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 - adding comments, cosmetic changes

Browse Source
skala
Julio Montoya 13 years ago
parent 23fded163a
commit 5a1d010dbf
4 changed files with 40 additions and 47 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. 26
      main/admin/course_add.php
  2. 51
      main/inc/global.inc.php
  3. 8
      main/inc/lib/events.lib.inc.php
  4. 2
      main/inc/local.inc.php

26
main/admin/course_add.php
Unescape View File

@ -29,7 +29,7 @@ $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' O
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status=1".$order_clause;
// Filtering teachers when creating a course.
if ($_configuration['multiple_access_urls']) {
if (api_is_multiple_url_enabled()) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT u.user_id,lastname,firstname FROM $table_user as u
INNER JOIN $access_url_rel_user_table url_rel_user
@ -65,7 +65,7 @@ $form->addRule('visual_code', get_lang('Max'), 'maxlength', CourseManager::MAX_C
$form->addElement('select', 'course_teachers', get_lang('CourseTeachers'), $teachers, ' id="course_teachers" class="chzn-select" style="width:350px" multiple="multiple" ');
$form->applyFilter('course_teachers', 'html_filter');
$categories_select = $form->addElement('select', 'category_code', get_lang('CourseFaculty'), $categories, array('style' => 'width:350px', 'class'=>'chzn-select', 'id'=>'category_code'));
$categories_select = $form->addElement('select', 'category_code', get_lang('CourseFaculty'), array(), array('style' => 'width:350px', 'class'=>'chzn-select', 'id'=>'category_code'));
$categories_select->addOption('-','');
$form->applyFilter('category_code', 'html_filter');
//This function fills the category_code select ...
@ -121,7 +121,7 @@ $default_course_visibility = api_get_setting('courses_default_creation_visibilit
if (isset($default_course_visibility)) {
$values['visibility'] = api_get_setting('courses_default_creation_visibility');
} else {
$values['visibility'] = COURSE_VISIBILITY_OPEN_PLATFORM;
$values['visibility'] = COURSE_VISIBILITY_OPEN_PLATFORM;
}
$values['subscribe'] = 1;
$values['unsubscribe'] = 0;
@ -132,21 +132,21 @@ $form->setDefaults($values);
// Validate the form
if ($form->validate()) {
$course = $form->exportValues();
$course = $form->exportValues();
//$tutor_name = $teachers[$course['tutor_id']];
$teacher_id = $course['tutor_id'];
$course_teachers = $course['course_teachers'];
$course_teachers = $course['course_teachers'];
$course['disk_quota'] = $course['disk_quota']*1024*1024;
$course['exemplary_content'] = empty($course['exemplary_content']) ? false : true;
$course['teachers'] = $course_teachers;
//$course['tutor_name'] = $tutor_name;
$course['user_id'] = $teacher_id;
$course['user_id'] = $teacher_id;
$course['wanted_code'] = $course['visual_code'];
$course['gradebook_model_id'] = isset($course['gradebook_model_id']) ? $course['gradebook_model_id'] : null;
$course['gradebook_model_id'] = isset($course['gradebook_model_id']) ? $course['gradebook_model_id'] : null;
$course_info = CourseManager::create_course($course);
header('Location: course_list.php'.($course_info===false?'?action=show_msg&warn='.api_get_last_failure():''));
@ -157,7 +157,5 @@ if ($form->validate()) {
$content = $form->return_form();
$tpl = new Template($tool_name);
$tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
$tpl->display_one_col_template();

51
main/inc/global.inc.php
Unescape View File

@ -28,17 +28,18 @@
//Composer autoloader
require_once __DIR__.'../../../vendor/autoload.php';
//Start Silex
use Silex\Application;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Yaml\Parser;
// Start Silex
$app = new Application();
//@todo add a helper to read the configuration file once!
// Reading configuration file from main/inc/conf or app/config
// @todo add a helper to read the configuration file once!
// Reading configuration file from main/inc/conf/configuration.php or app/config/configuration.yml
// Determine the directory path for this file.
$includePath = dirname(__FILE__);
@ -97,16 +98,30 @@ if ($alreadyInstalled) {
}
}
// Fixing $_configuration array
//Fixes bug in Chamilo 1.8.7.1 array was not set
$administrator['email'] = isset($administrator['email']) ? $administrator['email'] : 'admin@example.com';
$administrator['name'] = isset($administrator['name']) ? $administrator['name'] : 'Admin';
// Code for transitional purposes, it can be removed right before the 1.8.7 release.
if (empty($_configuration['system_version'])) {
$_configuration['system_version'] = (!empty($_configuration['dokeos_version']) ? $_configuration['dokeos_version'] : '');
$_configuration['system_stable'] = (!empty($_configuration['dokeos_stable']) ? $_configuration['dokeos_stable'] : '');
$_configuration['software_url'] = 'http://www.chamilo.org/';
}
// For backward compatibility.
$_configuration['dokeos_version'] = $_configuration['system_version'];
$_configuration['dokeos_stable'] = $_configuration['system_stable'];
$userPasswordCrypted = (!empty($_configuration['password_encryption']) ? $_configuration['password_encryption'] : 'sha1');
}
//Including main and internationalization libs
// Include the main Chamilo platform library file.
require_once $includePath.'/lib/main_api.lib.php';
// Inclusion of internationalization libraries
require_once $includePath.'/lib/internationalization.lib.php';
@ -132,24 +147,13 @@ $app->register(new Igorw\Silex\ConfigServiceProvider($settingsFile, array(
// Add the path to the pear packages to the include path
ini_set('include_path', api_create_include_path_setting());
// Code for transitional purposes, it can be removed right before the 1.8.7 release.
if (empty($_configuration['system_version'])) {
$_configuration['system_version'] = (!empty($_configuration['dokeos_version']) ? $_configuration['dokeos_version'] : '');
$_configuration['system_stable'] = (!empty($_configuration['dokeos_stable']) ? $_configuration['dokeos_stable'] : '');
$_configuration['software_url'] = 'http://www.chamilo.org/';
}
// For backward compatibility.
$_configuration['dokeos_version'] = $_configuration['system_version'];
$_configuration['dokeos_stable'] = $_configuration['system_stable'];
$userPasswordCrypted = (!empty($_configuration['password_encryption']) ? $_configuration['password_encryption'] : 'sha1');
$app['configuration_file'] = $configurationFilePath;
$app['configuration_yml_file'] = $configurationYMLFile;
$app['configuration'] = $_configuration;
$app['languages_file'] = array();
$app['installed'] = $alreadyInstalled;
//Loading $app settings
require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/prod.php';
//require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/dev.php';
@ -159,7 +163,7 @@ $app->register(new Silex\Provider\HttpCacheServiceProvider(), array(
'http_cache.cache_dir' => $app['http_cache.cache_dir'].'/',
));*/
//Session provider
// Session provider
//$app->register(new Silex\Provider\SessionServiceProvider());
/*
@ -228,10 +232,10 @@ $app->register(new Silex\Provider\SecurityServiceProvider(), array(
)
));*/
//Setting controllers as services
// Setting controllers as services
$app->register(new Silex\Provider\ServiceControllerServiceProvider());
//Validator provider
// Validator provider
$app->register(new Silex\Provider\ValidatorServiceProvider());
// Implements symfony2 translator
@ -240,7 +244,8 @@ $app->register(new Silex\Provider\TranslationServiceProvider(), array(
'locale_fallback' => 'en'
));
//Handling po files
// Handling po files
/*
use Symfony\Component\Translation\Loader\PoFileLoader;
use Symfony\Component\Translation\Dumper\PoFileDumper;
@ -352,8 +357,6 @@ $app['twig'] = $app->share(
})
);
//Monolog only available if cache is writable
if (is_writable($app['cache.path'])) {
@ -443,8 +446,6 @@ $app->register(new ChamiloServiceProvider(), array());
//Manage error messages
$app->error(
//PDOException
function (\Exception $e, $code) use ($app) {
if ( $e instanceof PDOException) {
@ -482,7 +483,7 @@ if ($app['debug'] && isset($_configuration['main_database'])) {
$app->after(function() use ($app, $logger) {
// Log all queries as DEBUG.
foreach ( $logger->queries as $query ) {
foreach ($logger->queries as $query) {
$app['monolog']->debug($query['sql'], array('params' =>$query['params'], 'types' => $query['types']));
}
});

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

@ -1567,10 +1567,4 @@ function portal_homepage_edited_event_send_mail_filter_func(&$values)
$res = _event_send_mail_filter_func($values);
// proper logic for this filter
return $res;
}
/**
*
*/
/* End of filters */
}

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

@ -989,4 +989,4 @@ if (isset($_cid)) {
$sql="UPDATE $tbl_course SET last_visit= '$time' WHERE code='$_cid'";
Database::query($sql);
}
Redirect::session_request_uri($logging_in, $user_id);
Redirect::session_request_uri($logging_in, $user_id);
Write Preview
Loading…
Cancel
Save