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

[svn r20520] Switched GARBAGE_PATH to SYS_ARCHIVE_PATH (see FS#4191)

Browse Source
skala
Yannick Warnier 16 years ago
parent ce9eb54be6
commit 3c2aec9b59
4 changed files with 24 additions and 115 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. 22
      main/admin/calendar.lib.php
  2. 45
      main/app_share/appshare.php
  3. 45
      main/app_share/index.php
  4. 27
      main/calendar/agenda.inc.php

22
main/admin/calendar.lib.php
Unescape View File

@ -1,23 +1,5 @@
<?php // $id: $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2008 Dokeos S.A.
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
* @package dokeos.admin
@ -3080,7 +3062,7 @@ function agenda_import_ical($course_info,$file)
{
require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
$charset = api_get_setting('platform_charset');
$filepath = api_get_path(GARBAGE_PATH).$file['name'];
$filepath = api_get_path(SYS_ARCHIVE_PATH).$file['name'];
if(!@move_uploaded_file($file['tmp_name'],$filepath))
{
error_log('Problem moving uploaded file: '.$file['error'].' in '.__FILE__.' line '.__LINE__);

45
main/app_share/appshare.php
Unescape View File

@ -1,46 +1,20 @@
<?php
// $Id: infocours.php 10902 2007-01-25 14:44:35Z elixir_julian $
<?php // $Id: infocours.php 10902 2007-01-25 14:44:35Z elixir_julian $
/* For licensing terms, see /dokeos_license.txt */
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Hugues Peeters
Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
Copyright (c) Olivier Brouckaert
Copyright (c) Bart Mollet, Hogeschool Gent
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
==============================================================================
INIT SECTION
==============================================================================
*/
// name of the language file that needs to be included
$language_file = array ('create_course', 'course_info');
include ('../inc/global.inc.php');
$language_file = array('create_course', 'course_info');
require '../inc/global.inc.php';
$this_section = SECTION_COURSES;
$nameTools = get_lang("ModifInfo");
$course_code = $_course["sysCode"];
// WARNING : try to use GARBAGE_PATH ? but no WEB_GARBAGE ? (api_get_path)
$app_share_tmp_dir_base = api_get_path(SYS_CODE_PATH).'garbage/app_share/';
$app_share_tmp_dir_base = api_get_path(SYS_ARCHIVE_PATH).'app_share/';
mkdir ($app_share_tmp_dir_base, 0700);
$app_share_tmp_dir = $app_share_tmp_dir_base.$course_code;
$app_base_file = api_get_path(SYS_CODE_PATH).'app_share/DokeosAppShare.exe';
@ -116,22 +90,21 @@ if ($_GET["client"] == 'true') {
} else {
if (api_is_allowed_to_edit()) {
// WARNING : try to use GARBAGE_PATH ? but no WEB_GARBAGE ? (api_get_path)
$linkToFile = api_get_path(WEB_PATH).'main/garbage/app_share/'.$course_code.'/DokeosAppShare.exe';
$linkToFile = api_get_path(WEB_ARCHIVE_PATH).'app_share/'.$course_code.'/DokeosAppShare.exe';
?>
<h3>prérequis pour DokeosAppShare :</h3>
<h3><?php echo get_lang('PrerequisitesForAppShare'); ?></h3>
<ul>
<li>Microsoft .NET : <a target="top" href="http://www.microsoft.com/downloads/details.aspx?familyid=0856eacb-4362-4b0d-8edd-aab15c5e04f5&displaylang=en">install</a></li>
<li style="margin-top: 5px;">Visual J# Redistributable Packages : <a target="top" href="http://msdn2.microsoft.com/en-us/vjsharp/bb188598.aspx">install</a></li>
</ul>
<form style="float: left;" id="view_screen" action="<?php echo($linkToFile);?>">
<input style="width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Partager mon écran" />
<input style="width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Partager mon <EFBFBD>cran" />
</form>
<?php
}?>
<form style="float: left;" id="view_screen" action="">
<input type="hidden" name="client" value="true" />
<input style="margin-left: 20px; width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Visualiser l'écran partagé" />
<input style="margin-left: 20px; width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Visualiser l'<EFBFBD>cran partag<EFBFBD>" />
</form><?php
}?>

45
main/app_share/index.php
Unescape View File

@ -1,46 +1,20 @@
<?php
// $Id: infocours.php 10902 2007-01-25 14:44:35Z elixir_julian $
<?php // $Id: infocours.php 10902 2007-01-25 14:44:35Z elixir_julian $
/* For licensing terms, see /dokeos_license.txt */
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Hugues Peeters
Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
Copyright (c) Olivier Brouckaert
Copyright (c) Bart Mollet, Hogeschool Gent
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
==============================================================================
INIT SECTION
==============================================================================
*/
// name of the language file that needs to be included
$language_file = array ('create_course', 'course_info');
include ('../../main/inc/global.inc.php');
$language_file = array('create_course', 'course_info');
require '../../main/inc/global.inc.php';
$this_section = SECTION_COURSES;
$nameTools = get_lang("ModifInfo");
$course_code = $_course["sysCode"];
// WARNING : try to use GARBAGE_PATH ? but no WEB_GARBAGE ? (api_get_path)
$app_share_tmp_dir_base = api_get_path(SYS_CODE_PATH).'garbage/app_share/';
$app_share_tmp_dir_base = api_get_path(SYS_ARCHIVE_PATH).'app_share/';
mkdir ($app_share_tmp_dir_base, 0700);
$app_share_tmp_dir = $app_share_tmp_dir_base.$course_code;
$app_base_file = api_get_path(SYS_CODE_PATH).'app_share/DokeosAppShare.exe';
@ -123,22 +97,21 @@ if ($_GET["client"] == 'true') {
} else {
if (api_is_allowed_to_edit()) {
// WARNING : try to use GARBAGE_PATH ? but no WEB_GARBAGE ? (api_get_path)
$linkToFile = api_get_path(WEB_PATH).'main/garbage/app_share/'.$course_code.'/DokeosAppShare.exe';
$linkToFile = api_get_path(WEB_ARCHIVE_PATH).'app_share/'.$course_code.'/DokeosAppShare.exe';
?>
<h3>prérequis pour DokeosAppShare :</h3>
<h3><?php echo get_lang('PrerequisitesForAppShare'); ?></h3>
<ul>
<li>Microsoft .NET : <a target="top" href="http://www.microsoft.com/downloads/details.aspx?familyid=0856eacb-4362-4b0d-8edd-aab15c5e04f5&displaylang=en">install</a></li>
<li style="margin-top: 5px;">Visual J# Redistributable Packages : <a target="top" href="http://msdn2.microsoft.com/en-us/vjsharp/bb188598.aspx">install</a></li>
</ul>
<form style="float: left;" id="view_screen" action="<?php echo($linkToFile);?>">
<input style="width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Partager mon écran" />
<input style="width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Partager mon <EFBFBD>cran" />
</form>
<?php
}?>
<form style="float: left;" id="view_screen" action="">
<input type="hidden" name="client" value="true" />
<input style="margin-left: 20px; width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Visualiser l'écran partagé" />
<input style="margin-left: 20px; width: 220px; font-size: 14px; font-weight: bold;" type="submit" value="Visualiser l'<EFBFBD>cran partag<EFBFBD>" />
</form><?php
}

27
main/calendar/agenda.inc.php
Unescape View File

@ -1,24 +1,6 @@
<?php //$Id: agenda.inc.php 20491 2009-05-11 20:14:24Z cvargas1 $
<?php //$Id: agenda.inc.php 20520 2009-05-12 00:34:16Z yannoo $
/* For licensing terms, see /dokeos_license.txt */
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2008 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
==============================================================================
@author: Patrick Cool, patrick.cool@UGent.be
@version: 1.1
@ -4630,11 +4612,10 @@ function agenda_add_repeat_item($course_info,$orig_id,$type,$end,$orig_dest,$fil
* @param array Course info
* @return boolean True on success, false otherwise
*/
function agenda_import_ical($course_info,$file)
{
function agenda_import_ical($course_info,$file) {
require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
$charset = api_get_setting('platform_charset');
$filepath = api_get_path(GARBAGE_PATH).$file['name'];
$filepath = api_get_path(SYS_ARCHIVE_PATH).$file['name'];
if(!@move_uploaded_file($file['tmp_name'],$filepath))
{
error_log('Problem moving uploaded file: '.$file['error'].' in '.__FILE__.' line '.__LINE__);

Write Preview
Loading…
Cancel
Save