@@ -94,12 +94,12 @@ |
||
94 | 94 | */ |
95 | 95 | protected $assignedLastUser; |
96 | 96 | |
97 | - /** |
|
98 | - * @var Status |
|
99 | - * |
|
100 | - * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Status") |
|
101 | - * @ORM\JoinColumn(name="status_id", referencedColumnName="id") |
|
102 | - **/ |
|
97 | + /** |
|
98 | + * @var Status |
|
99 | + * |
|
100 | + * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Status") |
|
101 | + * @ORM\JoinColumn(name="status_id", referencedColumnName="id") |
|
102 | + **/ |
|
103 | 103 | protected $status; |
104 | 104 | |
105 | 105 | /** |
@@ -56,7 +56,7 @@ |
||
56 | 56 | */ |
57 | 57 | protected $filename; |
58 | 58 | |
59 | - /** |
|
59 | + /** |
|
60 | 60 | * @var integer |
61 | 61 | * |
62 | 62 | * @ORM\Column(name="size", type="integer", nullable=false, unique=false) |
@@ -53,12 +53,12 @@ |
||
53 | 53 | */ |
54 | 54 | protected $ipAddress; |
55 | 55 | |
56 | - /** |
|
57 | - * @var Ticket |
|
58 | - * |
|
59 | - * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Ticket") |
|
60 | - * @ORM\JoinColumn(name="ticket_id", referencedColumnName="id") |
|
61 | - **/ |
|
56 | + /** |
|
57 | + * @var Ticket |
|
58 | + * |
|
59 | + * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Ticket") |
|
60 | + * @ORM\JoinColumn(name="ticket_id", referencedColumnName="id") |
|
61 | + **/ |
|
62 | 62 | protected $ticket; |
63 | 63 | |
64 | 64 | /** |
@@ -42,10 +42,10 @@ |
||
42 | 42 | // this 2 "mask" function are here just because the SortableTable |
43 | 43 | function get_legal_data_mask($id, $params = null, $row = null) |
44 | 44 | { |
45 | - return LegalManager::get_legal_data($id, $params, $row); |
|
45 | + return LegalManager::get_legal_data($id, $params, $row); |
|
46 | 46 | } |
47 | 47 | function count_mask() |
48 | 48 | { |
49 | - return LegalManager::count(); |
|
49 | + return LegalManager::count(); |
|
50 | 50 | } |
51 | 51 | Display :: display_footer(); |
@@ -619,8 +619,8 @@ discard block |
||
619 | 619 | } |
620 | 620 | |
621 | 621 | /** |
622 | - * Recycle Thematics |
|
623 | - */ |
|
622 | + * Recycle Thematics |
|
623 | + */ |
|
624 | 624 | public function recycle_thematic($session_id = 0) |
625 | 625 | { |
626 | 626 | if ($this->course->has_resources(RESOURCE_THEMATIC)) { |
@@ -685,8 +685,8 @@ discard block |
||
685 | 685 | } |
686 | 686 | |
687 | 687 | /** |
688 | - * Recycle Attendances |
|
689 | - */ |
|
688 | + * Recycle Attendances |
|
689 | + */ |
|
690 | 690 | public function recycle_attendance($session_id = 0) |
691 | 691 | { |
692 | 692 | if ($this->course->has_resources(RESOURCE_ATTENDANCE)) { |
@@ -17,7 +17,7 @@ |
||
17 | 17 | $result = $objExercise->read($exercise_id); |
18 | 18 | |
19 | 19 | if (!$result) { |
20 | - api_not_allowed(true); |
|
20 | + api_not_allowed(true); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | $interbreadcrumb[] = array( |
@@ -281,7 +281,7 @@ |
||
281 | 281 | $correct_answer_index = array_search($matches[1], $answers_array); |
282 | 282 | $exercise_info['question'][$question_index]['title'] = $matches[1]; |
283 | 283 | } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) { |
284 | - //TAGS for chamilo >= 1.10 |
|
284 | + //TAGS for chamilo >= 1.10 |
|
285 | 285 | $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]); |
286 | 286 | } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) { |
287 | 287 | //TAGS for chamilo >= 1.10 (Spanish e-ducativa format) |
@@ -458,7 +458,7 @@ |
||
458 | 458 | } |
459 | 459 | |
460 | 460 | if ($myLP->get_type() == 2) { |
461 | - $return .= "update_stats();"; |
|
461 | + $return .= "update_stats();"; |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | // To be sure progress is updated. |
@@ -13,11 +13,11 @@ |
||
13 | 13 | 'Accent', |
14 | 14 | 'Accenture', |
15 | 15 | 'ADLNet', |
16 | - 'Articulate', |
|
17 | - 'ATutor', |
|
18 | - 'Blackboard', |
|
19 | - 'Calfat', |
|
20 | - 'Captivate', |
|
16 | + 'Articulate', |
|
17 | + 'ATutor', |
|
18 | + 'Blackboard', |
|
19 | + 'Calfat', |
|
20 | + 'Captivate', |
|
21 | 21 | 'Chamilo', |
22 | 22 | 'Chamilo 2', |
23 | 23 | 'Claroline', |