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 - format code

Browse Source
remotes/angel/1.11.x
jmontoyaa 8 years ago
parent aeebddc7d4
commit c52e755cf5
7 changed files with 70 additions and 88 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. 57
      main/dropbox/dropbox_init.inc.php
  2. 20
      src/Chamilo/CoreBundle/Entity/SystemTemplate.php
  3. 20
      src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
  4. 1
      src/Chamilo/CoreBundle/Entity/TrackEDefault.php
  5. 20
      src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
  6. 20
      src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
  7. 20
      src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php

57
main/dropbox/dropbox_init.inc.php
Unescape View File

@ -1,6 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* @desc The dropbox is a personal (peer to peer) file exchange module that allows
* you to send documents to a certain (group of) users.
@ -111,9 +113,6 @@ Version 1.4 (Yannick Warnier)
* @package chamilo.dropbox
*/
use ChamiloSession as Session;
// including the basic Chamilo initialisation file
require_once __DIR__.'/../inc/global.inc.php';
$is_allowed_in_course = api_is_allowed_in_course();
$is_courseTutor = api_is_course_tutor();
@ -155,8 +154,6 @@ if (empty($session_id)) {
);
}
/* Object Initialisation */
// we need this here because the javascript to re-upload the file needs an array
// off all the documents that have already been sent.
// @todo consider moving the javascripts in a function that displays the javascripts
@ -210,8 +207,7 @@ if ($allowOverwrite == 'true') {
//sentArray keeps list of all files still available in the sent files list
//of the user.
//This is used to show or hide the overwrite file-radio button of the upload form
$javascript .= "
var sentArray = new Array(";
$javascript .= " var sentArray = new Array(";
if (isset($dropbox_person)) {
for ($i = 0; $i < count($dropbox_person->sentWork); $i++) {
if ($i > 0) {
@ -292,14 +288,12 @@ $(function () {
</script>";
$checked_files = false;
if (!$view || $view == 'received') {
$part = 'received';
$part = 'received';
} elseif ($view = 'sent') {
$part = 'sent';
$part = 'sent';
} else {
header('location: index.php?view='.$view.'&error=Error');
exit;
header('location: index.php?view='.$view.'&error=Error');
exit;
}
if (($postAction == 'download_received' || $postAction == 'download_sent') and !$_POST['store_feedback']) {
@ -323,11 +317,10 @@ if ((!$is_allowed_in_course || !$is_course_member) && !api_is_allowed_to_edit(nu
} else {
api_not_allowed();
}
exit();
exit();
}
/* BREADCRUMBS */
if ($view == 'received') {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq(),
@ -347,31 +340,31 @@ if ($view == 'received') {
if ($view == 'sent' || empty($view)) {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq(),
'name' => get_lang('Dropbox')
'name' => get_lang('Dropbox')
);
$nameTools = get_lang('SentFiles');
$nameTools = get_lang('SentFiles');
if ($action == 'addsentcategory') {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
'name' => get_lang('SentFiles'),
);
$nameTools = get_lang('AddNewCategory');
}
if ($action == 'add') {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
'name' => get_lang('SentFiles'),
);
$nameTools = get_lang('UploadNewFile');
}
if ($action == 'addsentcategory') {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
'name' => get_lang('SentFiles'),
);
$nameTools = get_lang('AddNewCategory');
}
if ($action == 'add') {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'dropbox/index.php?view=sent&'.api_get_cidreq(),
'name' => get_lang('SentFiles'),
);
$nameTools = get_lang('UploadNewFile');
}
}
/* HEADER & TITLE */
if (isset($origin) && $origin == 'learnpath') {
$htmlHeadXtra[] = $javascript;
Display::display_reduced_header($nameTools, 'Dropbox');
Display::display_reduced_header($nameTools, 'Dropbox');
} else {
Display::display_header($nameTools, 'Dropbox');
}

20
src/Chamilo/CoreBundle/Entity/SystemTemplate.php
Unescape View File

@ -13,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
*/
class SystemTemplate
{
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue()
*/
private $id;
/**
* @var string
*
@ -41,17 +50,6 @@ class SystemTemplate
*/
private $content;
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/**
* Set title
*

20
src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
Unescape View File

@ -13,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
*/
class TrackEAttemptCoeff
{
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
*/
private $id;
/**
* @var integer
*
@ -27,17 +36,6 @@ class TrackEAttemptCoeff
*/
private $marksCoeff;
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/**
* Set attemptId
*

1
src/Chamilo/CoreBundle/Entity/TrackEDefault.php
Unescape View File

@ -19,7 +19,6 @@ use Doctrine\ORM\Mapping as ORM;
*/
class TrackEDefault
{
/**
* @var integer
*

20
src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
Unescape View File

@ -13,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
*/
class TrackEHotpotatoes
{
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
*/
private $id;
/**
* @var string
*
@ -55,17 +64,6 @@ class TrackEHotpotatoes
*/
private $exeWeighting;
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/**
* Set exeName
*

20
src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
Unescape View File

@ -13,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
*/
class TrackEHotspot
{
/**
* @var integer
*
* @ORM\Column(name="hotspot_id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
*/
private $hotspotId;
/**
* @var integer
*
@ -69,17 +78,6 @@ class TrackEHotspot
*/
private $hotspotCoordinate;
/**
* @var integer
*
* @ORM\Column(name="hotspot_id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $hotspotId;
/**
* Set hotspotUserId
*

20
src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
Unescape View File

@ -13,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
*/
class TrackEItemProperty
{
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
*/
private $id;
/**
* @var integer
*
@ -69,17 +78,6 @@ class TrackEItemProperty
*/
private $sessionId;
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/**
* Set courseId
*

Write Preview
Loading…
Cancel
Save