Format code.

1.10.x
Julio Montoya 10 years ago
parent b458a6f0ec
commit 764cfa78fd
  1. 58
      main/calendar/download.php
  2. 1
      main/calendar/ical_export.php
  3. 28
      main/course_description/add.php
  4. 29
      main/course_description/edit.php
  5. 19
      main/course_description/index.php
  6. 14
      main/course_description/listing.php
  7. 19
      main/course_home/2column.php
  8. 6
      main/course_home/3column.php
  9. 1
      main/course_home/activity.php
  10. 5
      main/course_info/delete_course.php
  11. 5
      main/course_info/download.php
  12. 6
      main/course_info/infocours.php

@ -1,5 +1,6 @@
<?php // $Id: $
<?php
/* For licensing terms, see /license.txt */
/**
* This file is responsible for passing requested documents to the browser.
* Html files are parsed to fix a few problems with URLs,
@ -8,9 +9,6 @@
*
* @package chamilo.calendar
*/
/**
* MAIN CODE
*/
session_cache_limiter('public');
@ -22,11 +20,11 @@ header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
header('Cache-Control: public');
header('Pragma: no-cache');
$course_id = intval($_REQUEST['course_id']);
$user_id = api_get_user_id();
$course_info = api_get_course_info_by_id($course_id);
$doc_url = $_REQUEST['file'];
$session_id = api_get_session_id();
$course_id = intval($_REQUEST['course_id']);
$user_id = api_get_user_id();
$course_info = api_get_course_info_by_id($course_id);
$doc_url = $_REQUEST['file'];
$session_id = api_get_session_id();
if (empty($course_id)) {
$course_id = api_get_course_int_id();
@ -35,7 +33,12 @@ if (empty($course_id) || empty($doc_url)) {
api_not_allowed();
}
$is_user_is_subscribed = CourseManager::is_user_subscribed_in_course($user_id, $course_info['code'], true, $session_id);
$is_user_is_subscribed = CourseManager::is_user_subscribed_in_course(
$user_id,
$course_info['code'],
true,
$session_id
);
if (!api_is_allowed_to_edit() && !$is_user_is_subscribed) {
api_not_allowed();
@ -51,31 +54,36 @@ $full_file_name = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/upload/ca
//if the rewrite rule asks for a directory, we redirect to the document explorer
if (is_dir($full_file_name)) {
//remove last slash if present
//$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
//mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
//create the path
$document_explorer = api_get_path(WEB_COURSE_PATH).$course_info['path']; // home course path
//redirect
header('Location: '.$document_explorer);
exit;
while ($doc_url{$dul = strlen($doc_url) - 1} == '/') {
$doc_url = substr($doc_url, 0, $dul);
}
// create the path
$document_explorer = api_get_path(WEB_COURSE_PATH).$course_info['path']; // home course path
// redirect
header('Location: '.$document_explorer);
exit;
}
$tbl_agenda_attachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
$tbl_agenda_attachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
// launch event
Event::event_download($doc_url);
$sql='SELECT filename FROM '.$tbl_agenda_attachment.'
WHERE c_id = '.$course_id.' AND path LIKE BINARY "'.Database::escape_string($doc_url).'"';
$sql = 'SELECT filename FROM '.$tbl_agenda_attachment.'
WHERE
c_id = '.$course_id.' AND
path LIKE BINARY "'.Database::escape_string($doc_url).'"';
$result = Database::query($sql);
if (Database::num_rows($result)) {
$row = Database::fetch_array($result);
$title = str_replace(' ','_', $row['filename']);
if (Security::check_abs_path($full_file_name, api_get_path(SYS_COURSE_PATH).$course_info['path'].'/upload/calendar/')) {
$row = Database::fetch_array($result);
$title = str_replace(' ', '_', $row['filename']);
if (Security::check_abs_path(
$full_file_name,
api_get_path(SYS_COURSE_PATH).$course_info['path'].'/upload/calendar/')
) {
DocumentManager::file_send_for_download($full_file_name,TRUE, $title);
}
}
api_not_allowed();

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This file exclusively export calendar items to iCal or similar formats
* @author Yannick Warnier <yannick.warnier@beeznest.com>

@ -19,14 +19,18 @@ $categories[ADD_BLOCK] = get_lang('NewBloc');
$i=1;
echo '<div class="actions" style="margin-bottom:30px">';
echo '<a href="index.php?'.api_get_cidreq().'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="index.php?'.api_get_cidreq().'">'.
Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
'</a>';
ksort($categories);
foreach ($categories as $id => $title) {
if ($i==ADD_BLOCK) {
echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).'</a>';
break;
} else {
echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
$i++;
}
}
@ -48,13 +52,27 @@ if (!$error) {
$token = Security::get_token();
}
// display form
$form = new FormValidator('course_description','POST','index.php?action=add&'.api_get_cidreq());
$form = new FormValidator(
'course_description',
'POST',
'index.php?action=add&'.api_get_cidreq()
);
$form->addElement('header', '', $header);
$form->addElement('hidden', 'description_type',$description_type);
$form->addElement('hidden', 'sec_token',$token);
$form->addText('title', get_lang('Title'), true, array('size'=>'width: 350px;'));
$form->applyFilter('title','html_filter');
$form->addHtmlEditor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
$form->addHtmlEditor(
'contentDescription',
get_lang('Content'),
true,
false,
array(
'ToolbarSet' => 'TrainingDescription',
'Width' => '100%',
'Height' => '200',
)
);
$form->addButtonCreate(get_lang('Save'));
// display default questions

@ -23,15 +23,19 @@ $categories[ADD_BLOCK] = get_lang('NewBloc');
$i=1;
echo '<div class="actions" style="margin-bottom:30px">';
echo '<a href="index.php?'.api_get_cidreq().'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="index.php?'.api_get_cidreq().'">'.
Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
'</a>';
ksort($categories);
foreach ($categories as $id => $title) {
if ($i==ADD_BLOCK) {
echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
break;
} else {
echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
$i++;
}
}
@ -50,7 +54,12 @@ if ($description_type >= ADD_BLOCK) {
}
// display form
$form = new FormValidator('course_description','POST','index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq());
$form = new FormValidator(
'course_description',
'POST',
'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq(
)
);
$form->addElement('header','',$header);
$form->addElement('hidden', 'id', $original_id);
@ -58,7 +67,17 @@ $form->addElement('hidden', 'description_type',$description_type);
$form->addElement('hidden', 'sec_token',$token);
$form->addText('title', get_lang('Title'), true, array('size'=>'50'));
$form->applyFilter('title','html_filter');
$form->addHtmlEditor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200'));
$form->addHtmlEditor(
'contentDescription',
get_lang('Content'),
true,
false,
array(
'ToolbarSet' => 'TrainingDescription',
'Width' => '100%',
'Height' => '200',
)
);
$form->addButtonCreate(get_lang('Save'));
// Set some default values

@ -2,7 +2,8 @@
/* For licensing terms, see /license.txt */
/**
* Template (front controller in MVC pattern) used for distpaching to the controllers depend on the current action
* Template (front controller in MVC pattern) used for distpaching
* to the controllers depend on the current action
* @author Christian Fasanando <christian1827@gmail.com>
* @package chamilo.course_description
*/
@ -59,26 +60,26 @@ $course_description_controller = new CourseDescriptionController();
// distpacher actions to controller
switch ($action) {
case 'listing':
$course_description_controller->listing();
break;
$course_description_controller->listing();
break;
case 'history':
$course_description_controller->listing(true);
break;
case 'add' :
if (api_is_allowed_to_edit(null,true)) {
case 'add' :
if (api_is_allowed_to_edit(null, true)) {
$course_description_controller->add();
}
break;
case 'edit' :
if (api_is_allowed_to_edit(null,true)) {
case 'edit' :
if (api_is_allowed_to_edit(null, true)) {
$course_description_controller->edit($id, $description_type);
}
break;
case 'delete' :
if (api_is_allowed_to_edit(null,true)) {
if (api_is_allowed_to_edit(null, true)) {
$course_description_controller->destroy($id);
}
break;
default :
default :
$course_description_controller->listing();
}

@ -21,11 +21,11 @@ if ((isset($messages['edit']) && $messages['edit']) ||
// display actions menu
if (api_is_allowed_to_edit(null,true)) {
$categories = array ();
foreach ($default_description_titles as $id => $title) {
$categories[$id] = $title;
}
$categories[ADD_BLOCK] = get_lang('NewBloc');
$categories = array();
foreach ($default_description_titles as $id => $title) {
$categories[$id] = $title;
}
$categories[ADD_BLOCK] = get_lang('NewBloc');
$i=1;
echo '<div class="actions" style="margin-bottom:30px">';
@ -60,12 +60,12 @@ if (isset($descriptions) && count($descriptions) > 0) {
if (api_get_session_id() == $description['session_id']) {
$description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
//delete
// delete
echo '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
echo Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
echo '</a> ';
//edit
// edit
echo '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=edit&description_type='.$description['description_type'].'">';
echo Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
echo '</a> ';

@ -13,10 +13,6 @@
* @package chamilo.course_home
*/
/* MAIN CODE */
/* Work with data post askable by admin of course (franglais, clean this) */
$id = isset($_GET['id']) ? intval($_GET['id']) : null;
@ -47,7 +43,7 @@ if (api_is_allowed_to_edit(null, true)) {
/* HIDE */
elseif ($_GET['hide']) { // visibility 1 -> 0
elseif ($_GET['hide']) { // visibility 1 -> 0
Database::query("UPDATE $tool_table SET visibility=0 WHERE c_id = $course_id AND id='".$id."'");
$show_message .= Display::return_message(get_lang('ToolIsNowHidden'), 'confirmation');
}
@ -119,11 +115,10 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
/* Tools for platform admin only */
if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) {
$content .='<div class="platformadminview">
<span class="viewcaption">'.get_lang('PlatformAdminOnly').'</span>
<table width="100%">
'.CourseHome::show_tool_2column(TOOL_PLATFORM_ADMIN).'
</table>
</div>';
$content .='<div class="platformadminview">
<span class="viewcaption">'.get_lang('PlatformAdminOnly').'</span>
<table width="100%">
'.CourseHome::show_tool_2column(TOOL_PLATFORM_ADMIN).'
</table>
</div>';
}

@ -21,11 +21,8 @@ $course_id = api_get_course_int_id();
// WORK with data post askable by admin of course
if (api_is_allowed_to_edit(null, true)) {
/* Processing request */
/* MODIFY HOME PAGE */
/*
* Edit visibility of tools
*
@ -186,7 +183,6 @@ if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coa
* Process hiding a tools from aivailable tools.
* visibility=2 are only viewed by Dokeos Administrator visibility 0,1->2
*/
elseif (isset($delete) && $delete) {
Database::query("DELETE FROM $TBL_ACCUEIL WHERE c_id = $course_id AND id = $id AND added_tool=1");
}
@ -216,9 +212,7 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
$content .= "</td>\n</tr>\n";
}
/* TOOLS FOR PLATFORM ADMIN ONLY */
if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) {
$content .= "<tr>"."<td colspan=\"6\">".
"<hr noshade size=\"1\" />".

@ -183,5 +183,6 @@ function return_block($title, $content, $class = null)
</div>
</div>
<div class="row '.$class.'">'.$content.'</div>';
return $html;
}

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This script is about deleting a course.
* It displays a message box ('are you sure you wish to delete this course')
@ -7,9 +8,7 @@
*
* @package chamilo.course_info
*/
/**
* Code
*/
use \ChamiloSession as Session;
require_once '../inc/global.inc.php';

@ -1,12 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Download script for course info
* @package chamilo.course_info
*/
/**
* Code
*/
//session_cache_limiter('public');
require_once '../inc/global.inc.php';
$this_section = SECTION_COURSES;

@ -13,6 +13,7 @@
* @author Julio Montoya <gugli100@gmail.com> Jquery support + lots of fixes
* @package chamilo.course_info
*/
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_COURSE_SETTING;
$this_section = SECTION_COURSES;
@ -35,7 +36,8 @@ $courseId = api_get_course_int_id();
$course_access_settings = CourseManager:: get_access_settings($course_code);
//LOGIC FUNCTIONS
function is_settings_editable() {
function is_settings_editable()
{
return isset($GLOBALS['course_info_is_editable']) && $GLOBALS['course_info_is_editable'];
}
@ -441,9 +443,7 @@ if ($form->validate() && is_settings_editable()) {
$num = CourseManager::countActiveCourses($urlId);
if ($num >= $_configuration[$urlId]['hosting_limit_active_courses']) {
api_warn_hosting_contact('hosting_limit_active_courses');
api_set_failure(get_lang('PortalActiveCoursesLimitReached'));
$url = api_get_path(WEB_CODE_PATH).'course_info/infocours.php?action=course_active_warning&cidReq='.$course_code;
header("Location: $url");
exit;

Loading…
Cancel
Save