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

Notebook teacher - Minor improvements

Browse Source 
- Format code
- readme is now a markdown
- Use ChamiloSession instead of $_SESSION
- Rename classes
- Use api_get_plugin_setting
- deleted unused file

See #2463
pull/2475/head
jmontoyaa 8 years ago
parent 6c7152fd63
commit 034656cc41
14 changed files with 123 additions and 144 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. 4
      main/mySpace/myStudents.php
  2. 20
      plugin/notebookteacher/README.md
  3. 2
      plugin/notebookteacher/config.php
  4. 5
      plugin/notebookteacher/database.php
  5. 5
      plugin/notebookteacher/install.php
  6. 2
      plugin/notebookteacher/plugin.php
  7. 19
      plugin/notebookteacher/readme.txt
  8. 83
      plugin/notebookteacher/src/NotebookTeacher.php
  9. 21
      plugin/notebookteacher/src/NotebookTeacherPlugin.php
  10. 7
      plugin/notebookteacher/src/index.notebookteacher.php
  11. 78
      plugin/notebookteacher/src/index.php
  12. 9
      plugin/notebookteacher/start.php
  13. 5
      plugin/notebookteacher/uninstall.php
  14. 7
      plugin/notebookteacher/update.php

4
main/mySpace/myStudents.php
Unescape View File

@ -419,9 +419,7 @@ if (!empty($student_id) && !empty($course_code)) {
'</a>'; '</a>';
} }
$notebookTeacherPlugin = NotebookTeacherPlugin::create(); $notebookTeacherEnable = api_get_plugin_setting('notebookteacher', 'enable_plugin_notebookteacher') === 'true';
$notebookTeacherEnable = $notebookTeacherPlugin->get('enable_plugin_notebookteacher') === 'true';
if ($notebookTeacherEnable && !empty($student_id) && !empty($course_code)) { if ($notebookTeacherEnable && !empty($student_id) && !empty($course_code)) {
// link notebookteacher // link notebookteacher
$optionsLink = 'student_id='.$student_id.'&origin='.$origin.'&cidReq='.$course_code.'&id_session='.$sessionId; $optionsLink = 'student_id='.$student_id.'&origin='.$origin.'&cidReq='.$course_code.'&id_session='.$sessionId;

20
plugin/notebookteacher/README.md
Unescape View File

@ -0,0 +1,20 @@
Este plugin da la posibilidad a los profesores de un curso escribir en un bloc de notas compartido.
Los estudiantes no tienen acceso a las notas compartidas de los profesores.
**Instrucciones de puesta en funcionamiento**
- Subir la carpeta **notebookteacher** a la carpeta plugin de chamilo.
- Habilitar el plugin en la administraci&oacute;n de Chamilo.
- El icono de la herramienta aparecer&aacute; en pantalla de los cursos con el resto de herramientas
- Si no se visualiza el icono en el cursos correctamente y sale el icono de plugin gen&eacute;rico:
- Copiar los iconos de la carpeta resources/img/64 dentro de /main/img/icons/64
- Copiar el icono de la carpeta resources/img/22 dentro de /main/img
**Solo si ya tiene instalado el plugin previamente:**
Para actualizar la base de datos del plugin con los &uacute;ltimos cambios de la estructura deber&aacute; poner en su
navegador la siguiente direcci&oacute;n cambiando el nombre del dominio con el que proceda en su caso.
http://*sudominio.com*/**plugin/notebookteacher/update.php**

2
plugin/notebookteacher/config.php
Unescape View File

@ -8,5 +8,3 @@
* @author Jose Angel Ruiz <desarrollo@nosolored.com> * @author Jose Angel Ruiz <desarrollo@nosolored.com>
*/ */
require_once __DIR__.'/../../main/inc/global.inc.php'; require_once __DIR__.'/../../main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'plugin.class.php';
require_once api_get_path(SYS_PLUGIN_PATH).'notebookteacher/src/notebookteacher_plugin.class.php';

5
plugin/notebookteacher/database.php
Unescape View File

@ -1,5 +1,6 @@
<?php <?php
/* For license terms, see /license.txt */ /* For license terms, see /license.txt */
/** /**
* Plugin database installation script. Can only be executed if included * Plugin database installation script. Can only be executed if included
* inside another script loading global.inc.php. * inside another script loading global.inc.php.
@ -18,6 +19,10 @@ $pluginSchema = new \Doctrine\DBAL\Schema\Schema();
$connection = $entityManager->getConnection(); $connection = $entityManager->getConnection();
$platform = $connection->getDatabasePlatform(); $platform = $connection->getDatabasePlatform();
if ($pluginSchema->hasTable(NotebookTeacherPlugin::TABLE_NOTEBOOKTEACHER)) {
return;
}
//Create tables //Create tables
$notebookTable = $pluginSchema->createTable(NotebookTeacherPlugin::TABLE_NOTEBOOKTEACHER); $notebookTable = $pluginSchema->createTable(NotebookTeacherPlugin::TABLE_NOTEBOOKTEACHER);
$notebookTable->addColumn('id', \Doctrine\DBAL\Types\Type::INTEGER, ['autoincrement' => true, 'unsigned' => true]); $notebookTable->addColumn('id', \Doctrine\DBAL\Types\Type::INTEGER, ['autoincrement' => true, 'unsigned' => true]);

5
plugin/notebookteacher/install.php
Unescape View File

@ -1,14 +1,13 @@
<?php <?php
/* For license terms, see /license.txt */ /* For license terms, see /license.txt */
/** /**
* This script is included by main/admin/settings.lib.php and generally * This script is included by main/admin/settings.lib.php and generally
* includes things to execute in the main database (settings_current table). * includes things to execute in the main database (settings_current table).
* *
* @package chamilo.plugin.notebookteacher * @package chamilo.plugin.notebookteacher
*/ */
/**
* Initialization.
*/
require_once __DIR__.'/config.php'; require_once __DIR__.'/config.php';
if (!api_is_platform_admin()) { if (!api_is_platform_admin()) {
die('You must have admin permissions to install plugins'); die('You must have admin permissions to install plugins');

2
plugin/notebookteacher/plugin.php
Unescape View File

@ -1,5 +1,6 @@
<?php <?php
/* For license terms, see /license.txt */ /* For license terms, see /license.txt */
/** /**
* This script is a configuration file for the date plugin. * This script is a configuration file for the date plugin.
* You can use it as a master for other platform plugins (course plugins are slightly different). * You can use it as a master for other platform plugins (course plugins are slightly different).
@ -7,6 +8,7 @@
* *
* @package chamilo.plugin.notebookteacher * @package chamilo.plugin.notebookteacher
*/ */
/** /**
* Plugin details (must be present). * Plugin details (must be present).
*/ */

19
plugin/notebookteacher/readme.txt
Unescape View File

@ -1,19 +0,0 @@
Este plugin da la posibilidad a los profesores de un curso escribir en un bloc de notas compartido.<br>
Los estudiantes no tienen acceso a las notas compartidas de los profesores.<br/><br/>
<b>Instrucciones de puesta en funcionamiento:</b><br>
- Subir la carpeta <b>notebookteacher</b> a la carpeta plugin de chamilo.<br>
- Habilitar el plugin en la administraci&oacute;n de Chamilo.<br>
- El icono de la herramienta aparecer&aacute; en pantalla de los cursos con el resto de herramientas<br>
- Si no se visualiza el icono en el cursos correctamente y sale el icono de plugin gen&eacute;rico:<br>
<ul>
<li>Copiar los iconos de la carpeta resources/img/64 dentro de /main/img/icons/64</li>
<li>Copiar el icono de la carpeta resources/img/22 dentro de /main/img</li>
</ul>
<br>
<b>Solo si ya tiene instalado el plugin previamente:</b><br>
Para actualizar la base de datos del plugin con los &uacute;ltimos cambios de la estructura deber&aacute; poner en su
navegador la siguiente direcci&oacute;n cambiando el nombre del dominio con el que proceda en su caso.<br>
http://<i>sudominio.com/</i><b>plugin/notebookteacher/update.php</b>
</p>
<br>

83
plugin/notebookteacher/src/notebookteacher.lib.php → plugin/notebookteacher/src/NotebookTeacher.php
Unescape View File

@ -2,7 +2,9 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session; use ChamiloSession as Session;
require_once __DIR__.'/../config.php'; require_once __DIR__.'/../config.php';
/** /**
* This class provides methods for the notebook management. * This class provides methods for the notebook management.
* Include/require it in your code to use its features. * Include/require it in your code to use its features.
@ -48,8 +50,8 @@ class NotebookTeacher
* *
* @param array $values * @param array $values
* @param int $userId Optional. The user ID * @param int $userId Optional. The user ID
+ * @param int $courseId Optional. The course ID * @param int $courseId Optional. The course ID
+ * @param int $sessionId Optional. The session ID * @param int $sessionId Optional. The session ID
* *
* @return bool * @return bool
*/ */
@ -154,6 +156,7 @@ class NotebookTeacher
], ],
] ]
); );
return true; return true;
} }
@ -196,7 +199,7 @@ class NotebookTeacher
if (!isset($_GET['direction'])) { if (!isset($_GET['direction'])) {
$sortDirection = 'ASC'; $sortDirection = 'ASC';
$linkSortDirection = 'DESC'; $linkSortDirection = 'DESC';
} else if ($_GET['direction'] == 'ASC') { } elseif ($_GET['direction'] == 'ASC') {
$sortDirection = 'ASC'; $sortDirection = 'ASC';
$linkSortDirection = 'DESC'; $linkSortDirection = 'DESC';
} else { } else {
@ -205,7 +208,6 @@ class NotebookTeacher
} }
$studentId = isset($_GET['student_id']) ? $_GET['student_id'] : null; $studentId = isset($_GET['student_id']) ? $_GET['student_id'] : null;
$selectStudent = '';
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$courseCode = api_get_course_id(); $courseCode = api_get_course_id();
$active = isset($_GET['active']) ? $_GET['active'] : null; $active = isset($_GET['active']) ? $_GET['active'] : null;
@ -242,9 +244,9 @@ class NotebookTeacher
} else { } else {
$sql .= " AND session_course_user.status = 0 "; $sql .= " AND session_course_user.status = 0 ";
} }
$sql .= $sortByfirstName $sql .= $sortByfirstName
? ' ORDER BY user.firstname, user.lastname' ? ' ORDER BY user.firstname, user.lastname'
: ' ORDER BY user.lastname, user.firstname'; : ' ORDER BY user.lastname, user.firstname';
$rs = Database::query($sql); $rs = Database::query($sql);
@ -331,25 +333,28 @@ class NotebookTeacher
echo '</div>'; echo '</div>';
echo '<div class="row">'.$selectStudent.'</div>'; echo '<div class="row">'.$selectStudent.'</div>';
if (!isset($_SESSION['notebook_view']) || $view = Session::read('notebook_view');
!in_array($_SESSION['notebook_view'], ['creation_date', 'update_date', 'title']) if (!isset($view) ||
!in_array($view, ['creation_date', 'update_date', 'title'])
) { ) {
$_SESSION['notebook_view'] = 'creation_date'; Session::write('notebook_view', 'creation_date');
} }
$view = Session::read('notebook_view');
// Database table definition // Database table definition
$tableNotebook = Database::get_main_table(NotebookTeacherPlugin::TABLE_NOTEBOOKTEACHER); $tableNotebook = Database::get_main_table(NotebookTeacherPlugin::TABLE_NOTEBOOKTEACHER);
if ($_SESSION['notebook_view'] == 'creation_date' || $_SESSION['notebook_view'] == 'update_date') { if ($view == 'creation_date' || $view == 'update_date') {
$orderBy = " ORDER BY ".$_SESSION['notebook_view']." $sortDirection "; $orderBy = " ORDER BY $view $sortDirection ";
} else { } else {
$orderBy = " ORDER BY ".$_SESSION['notebook_view']." $sortDirection "; $orderBy = " ORDER BY $view $sortDirection ";
} }
//condition for the session //condition for the session
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$conditionSession = api_get_session_condition($session_id); $conditionSession = api_get_session_condition($session_id);
$condExtra = ($_SESSION['notebook_view'] == 'update_date') ? " AND update_date <> ''" : " "; $condExtra = $view == 'update_date' ? " AND update_date <> ''" : " ";
$courseId = api_get_course_int_id(); $courseId = api_get_course_int_id();
if ($studentId > 0) { if ($studentId > 0) {
@ -368,11 +373,10 @@ class NotebookTeacher
if (Database::num_rows($result) > 0) { if (Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
if ($first) { if ($first) {
$studentText = '';
if ($row['student_id'] > 0) { if ($row['student_id'] > 0) {
$studentInfo = api_get_user_info($row['student_id']); $studentInfo = api_get_user_info($row['student_id']);
$studentText = $studentInfo['complete_name']; $studentText = $studentInfo['complete_name'];
} else {
$studentText = '';
} }
echo Display::page_subheader($studentText); echo Display::page_subheader($studentText);
$first = false; $first = false;
@ -386,7 +390,7 @@ class NotebookTeacher
} }
$userInfo = api_get_user_info($row['user_id']); $userInfo = api_get_user_info($row['user_id']);
$author = ', '.get_lang('Teacher').': '.$userInfo['complete_name']; $author = ', '.get_lang('Teacher').': '.$userInfo['complete_name'];
$actions = '';
if (intval($row['user_id']) == api_get_user_id()) { if (intval($row['user_id']) == api_get_user_id()) {
$actions = '<a href="'. $actions = '<a href="'.
api_get_self().'?'. api_get_self().'?'.
@ -397,15 +401,12 @@ class NotebookTeacher
'?action=deletenote&notebook_id='.$row['id']. '?action=deletenote&notebook_id='.$row['id'].
'" onclick="return confirmation(\''.$row['title'].'\');">'. '" onclick="return confirmation(\''.$row['title'].'\');">'.
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'; Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
} else {
$actions = '';
} }
echo Display::panel( echo Display::panel(
$row['description'], $row['description'],
$row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>', $row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>',
get_lang('CreationDate').': '. get_lang('CreationDate').': '.
Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author
); );
} }
} else { } else {
@ -416,7 +417,6 @@ class NotebookTeacher
foreach ($courseUsersList as $key => $userItem) { foreach ($courseUsersList as $key => $userItem) {
$studentId = $key; $studentId = $key;
$studentText = $userItem['firstname'].' '.$userItem['lastname']; $studentText = $userItem['firstname'].' '.$userItem['lastname'];
$conditionStudent = " AND student_id = $studentId"; $conditionStudent = " AND student_id = $studentId";
$sql = "SELECT * FROM $tableNotebook $sql = "SELECT * FROM $tableNotebook
@ -431,7 +431,6 @@ class NotebookTeacher
if (Database::num_rows($result) > 0) { if (Database::num_rows($result) > 0) {
echo Display::page_subheader($studentText); echo Display::page_subheader($studentText);
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
// Validation when belongs to a session // Validation when belongs to a session
$sessionImg = api_get_session_image($row['session_id'], $userInfo['status']); $sessionImg = api_get_session_image($row['session_id'], $userInfo['status']);
$updateValue = ''; $updateValue = '';
@ -446,26 +445,26 @@ class NotebookTeacher
if (intval($row['user_id']) == api_get_user_id()) { if (intval($row['user_id']) == api_get_user_id()) {
$actions = '<a href="'.api_get_self(). $actions = '<a href="'.api_get_self().
'?action=editnote&notebook_id='.$row['id'].'&'.api_get_cidreq().'">'. '?action=editnote&notebook_id='.$row['id'].'&'.api_get_cidreq().'">'.
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'; Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
$actions .= '<a href="'.api_get_self(). $actions .= '<a href="'.api_get_self().
'?action=deletenote&notebook_id='.$row['id']. '?action=deletenote&notebook_id='.$row['id'].
'" onclick="return confirmation(\''.$row['title'].'\');">'. '" onclick="return confirmation(\''.$row['title'].'\');">'.
Display::return_icon( Display::return_icon(
'delete.png', 'delete.png',
get_lang('Delete'), get_lang('Delete'),
'', '',
ICON_SIZE_SMALL ICON_SIZE_SMALL
).'</a>'; ).'</a>';
} else { } else {
$actions = ''; $actions = '';
} }
echo Display::panel( echo Display::panel(
$row['description'], $row['description'],
$row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>', $row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>',
get_lang('CreationDate').': '. get_lang('CreationDate').': '.
Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author
); );
} }
} }
@ -485,7 +484,6 @@ class NotebookTeacher
if (Database::num_rows($result) > 0) { if (Database::num_rows($result) > 0) {
echo Display::page_subheader($plugin->get_lang('NotebookNoStudentAssigned')); echo Display::page_subheader($plugin->get_lang('NotebookNoStudentAssigned'));
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
// Validation when belongs to a session // Validation when belongs to a session
$sessionImg = api_get_session_image($row['session_id'], $userInfo['status']); $sessionImg = api_get_session_image($row['session_id'], $userInfo['status']);
$updateValue = ''; $updateValue = '';
@ -497,7 +495,7 @@ class NotebookTeacher
$userInfo = api_get_user_info($row['user_id']); $userInfo = api_get_user_info($row['user_id']);
$author = ', '.get_lang('Teacher').': '.$userInfo['complete_name']; $author = ', '.get_lang('Teacher').': '.$userInfo['complete_name'];
$actions = '';
if (intval($row['user_id']) == api_get_user_id()) { if (intval($row['user_id']) == api_get_user_id()) {
$actions = '<a href="'.api_get_self(). $actions = '<a href="'.api_get_self().
'?action=editnote&notebook_id='.$row['id'].'&'.api_get_cidreq().'">'. '?action=editnote&notebook_id='.$row['id'].'&'.api_get_cidreq().'">'.
@ -506,15 +504,12 @@ class NotebookTeacher
'?action=deletenote&notebook_id='.$row['id']. '?action=deletenote&notebook_id='.$row['id'].
'" onclick="return confirmation(\''.$row['title'].'\');">'. '" onclick="return confirmation(\''.$row['title'].'\');">'.
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'; Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
} else {
$actions = '';
} }
echo Display::panel( echo Display::panel(
$row['description'], $row['description'],
$row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>', $row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>',
get_lang('CreationDate').': '. get_lang('CreationDate').': '.
Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author
); );
} }
} }

21
plugin/notebookteacher/src/notebookteacher_plugin.class.php → plugin/notebookteacher/src/NotebookTeacherPlugin.php
Unescape View File

@ -1,15 +1,12 @@
<?php <?php
/* For license terms, see /license.txt */ /* For license terms, see /license.txt */
/** /**
* Description of notebookteacher_plugin. * Plugin class for the NotebookTeacher plugin.
*
* @package chamilo.plugin.notebookteacher * @package chamilo.plugin.notebookteacher
* *
* @author Jose Angel Ruiz <desarrollo@nosolored.com> * @author Jose Angel Ruiz <desarrollo@nosolored.com>
*/ */
/**
* Plugin class for the NotebookTeacher plugin.
*/
class NotebookTeacherPlugin extends Plugin class NotebookTeacherPlugin extends Plugin
{ {
const TABLE_NOTEBOOKTEACHER = 'plugin_notebook_teacher'; const TABLE_NOTEBOOKTEACHER = 'plugin_notebook_teacher';
@ -19,7 +16,7 @@ class NotebookTeacherPlugin extends Plugin
{ {
parent::__construct( parent::__construct(
'1.1', '1.1',
'Jose Angel Ruiz - NoSoloRed (original author)', 'Jose Angel Ruiz - NoSoloRed (original author), Julio Montoya',
[ [
'enable_plugin_notebookteacher' => 'boolean', 'enable_plugin_notebookteacher' => 'boolean',
] ]
@ -29,7 +26,7 @@ class NotebookTeacherPlugin extends Plugin
} }
/** /**
* @return StaticPlugin * @return NotebookTeacherPlugin
*/ */
public static function create() public static function create()
{ {
@ -46,9 +43,7 @@ class NotebookTeacherPlugin extends Plugin
//Installing course settings //Installing course settings
$this->install_course_fields_in_all_courses(); $this->install_course_fields_in_all_courses();
$tablesToBeCompared = [ $tablesToBeCompared = [self::TABLE_NOTEBOOKTEACHER];
self::TABLE_NOTEBOOKTEACHER,
];
$em = Database::getManager(); $em = Database::getManager();
$cn = $em->getConnection(); $cn = $em->getConnection();
$sm = $cn->getSchemaManager(); $sm = $cn->getSchemaManager();
@ -79,12 +74,10 @@ class NotebookTeacherPlugin extends Plugin
*/ */
public function uninstall() public function uninstall()
{ {
//Deleting course settings // Deleting course settings.
$this->uninstall_course_fields_in_all_courses($this->course_settings); $this->uninstall_course_fields_in_all_courses($this->course_settings);
$tablesToBeDeleted = [ $tablesToBeDeleted = [TABLE_NOTEBOOKTEACHER];
TABLE_NOTEBOOKTEACHER,
];
foreach ($tablesToBeDeleted as $tableToBeDeleted) { foreach ($tablesToBeDeleted as $tableToBeDeleted) {
$table = Database::get_main_table($tableToBeDeleted); $table = Database::get_main_table($tableToBeDeleted);
$sql = "DROP TABLE IF EXISTS $table"; $sql = "DROP TABLE IF EXISTS $table";

7
plugin/notebookteacher/src/index.notebookteacher.php
Unescape View File

@ -1,7 +0,0 @@
<?php
/* For license terms, see /license.txt */
/**
* Index of the Test to pdf plugin courses list.
*
* @package chamilo.plugin.notebookteacher
*/

78
plugin/notebookteacher/src/index.php
Unescape View File

@ -1,9 +1,10 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
$course_plugin = 'notebookteacher'; $course_plugin = 'notebookteacher';
require_once __DIR__.'/../config.php'; require_once __DIR__.'/../config.php';
require_once __DIR__.'/notebookteacher.lib.php';
$_setting['student_view_enabled'] = 'false'; $_setting['student_view_enabled'] = 'false';
@ -56,7 +57,7 @@ if ($enable) {
$tool = 'ModifyNote'; $tool = 'ModifyNote';
$interbreadcrumb[] = [ $interbreadcrumb[] = [
'url' => 'index.php?'.api_get_cidreq(), 'url' => 'index.php?'.api_get_cidreq(),
'name' => $plugin->get_lang('NotebookTeacher') 'name' => $plugin->get_lang('NotebookTeacher'),
]; ];
} }
@ -68,11 +69,11 @@ if ($enable) {
// Action handling: Adding a note // Action handling: Adding a note
if ($action === 'addnote') { if ($action === 'addnote') {
if ((api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true) || api_is_drh())) { if ((api_get_session_id() != 0 &&
!api_is_allowed_to_session_edit(false, true) || api_is_drh())) {
api_not_allowed(); api_not_allowed();
} }
Session::write('notebook_view', 'creation_date');
$_SESSION['notebook_view'] = 'creation_date';
$form = new FormValidator( $form = new FormValidator(
'note', 'note',
@ -152,13 +153,13 @@ if ($enable) {
} }
$form->addElement( $form->addElement(
'select', 'select',
'student_id', 'student_id',
get_lang('Student'), get_lang('Student'),
$studentList, $studentList,
[ [
'id' => 'student_id', 'id' => 'student_id',
] ]
); );
$form->addElement( $form->addElement(
@ -264,19 +265,19 @@ if ($enable) {
} }
} else { } else {
$a_course_users = CourseManager::get_user_list_from_course_code( $a_course_users = CourseManager::get_user_list_from_course_code(
$courseCode, $courseCode,
0, 0,
null, null,
null, null,
$status, $status,
null, null,
false, false,
false, false,
null, null,
null, null,
null, null,
$active $active
); );
} }
$studentList = []; $studentList = [];
@ -286,13 +287,13 @@ if ($enable) {
} }
$form->addElement( $form->addElement(
'select', 'select',
'student_id', 'student_id',
get_lang('Student'), get_lang('Student'),
$studentList, $studentList,
[ [
'id' => 'student_id', 'id' => 'student_id',
] ]
); );
$form->addElement( $form->addElement(
@ -343,9 +344,7 @@ if ($enable) {
} }
NotebookTeacher::displayNotes(); NotebookTeacher::displayNotes();
} elseif ( } elseif ($action === 'changeview' && in_array($_GET['view'], ['creation_date', 'update_date', 'title'])) {
$action === 'changeview' && in_array($_GET['view'], ['creation_date', 'update_date', 'title'])) {
// Action handling: changing the view (sorting order) // Action handling: changing the view (sorting order)
switch ($_GET['view']) { switch ($_GET['view']) {
case 'creation_date': case 'creation_date':
@ -370,17 +369,15 @@ if ($enable) {
} }
break; break;
} }
$_SESSION['notebook_view'] = $_GET['view']; Session::write('notebook_view', Security::remove_XSS($_GET['view']));
NotebookTeacher::displayNotes(); NotebookTeacher::displayNotes();
} else { } else {
NotebookTeacher::displayNotes(); NotebookTeacher::displayNotes();
} }
Display::display_footer(); Display::display_footer();
} else { } else {
/** @var \Chamilo\CoreBundle\Entity\Session $session */ $session = api_get_session_entity(api_get_session_id());
$session = Database::getManager()
->find('ChamiloCoreBundle:Session', api_get_session_id());
$_course = api_get_course_info(); $_course = api_get_course_info();
$web_course_path = api_get_path(WEB_COURSE_PATH); $web_course_path = api_get_path(WEB_COURSE_PATH);
$url = $web_course_path.$_course['path'].'/index.php'.($session ? '?id_session='.$session->getId() : ''); $url = $web_course_path.$_course['path'].'/index.php'.($session ? '?id_session='.$session->getId() : '');
@ -390,6 +387,7 @@ if ($enable) {
); );
header('Location: '.$url); header('Location: '.$url);
exit;
} }
} else { } else {
echo $plugin->get_lang('ToolDisabled'); echo $plugin->get_lang('ToolDisabled');

9
plugin/notebookteacher/start.php
Unescape View File

@ -17,19 +17,18 @@ if ($enable) {
header('Location: '.$url); header('Location: '.$url);
exit; exit;
} else { } else {
/** @var \Chamilo\CoreBundle\Entity\Session $session */ $session = api_get_session_entity(api_get_session_id());
$session = Database::getManager()
->find('ChamiloCoreBundle:Session', api_get_session_id());
$_course = api_get_course_info(); $_course = api_get_course_info();
$webCoursePath = api_get_path(WEB_COURSE_PATH); $webCoursePath = api_get_path(WEB_COURSE_PATH);
$url = $webCoursePath.$_course['path'].'/index.php'.($session ? '?id_session='.$session->getId() : ''); $url = $webCoursePath.$_course['path'].'/index.php'.($session ? '?id_session='.$session->getId() : '');
Display::addFlash( Display::addFlash(
Display::return_message($plugin->get_lang('ToolForTeacher')) Display::return_message($plugin->get_lang('ToolForTeacher'))
); );
header('Location: '.$url); header('Location: '.$url);
exit;
} }
} else { } else {
echo $plugin->get_lang('ToolDisabled'); api_not_allowed(true, $plugin->get_lang('ToolDisabled'));
} }

5
plugin/notebookteacher/uninstall.php
Unescape View File

@ -1,5 +1,6 @@
<?php <?php
/* For license terms, see /license.txt */ /* For license terms, see /license.txt */
/** /**
* This script is included by main/admin/settings.lib.php when unselecting a plugin * This script is included by main/admin/settings.lib.php when unselecting a plugin
* and is meant to remove things installed by the install.php script in both * and is meant to remove things installed by the install.php script in both
@ -7,8 +8,6 @@
* *
* @package chamilo.plugin.notebookteacher * @package chamilo.plugin.notebookteacher
*/ */
/**
* Queries.
*/
require_once __DIR__.'/config.php'; require_once __DIR__.'/config.php';
NotebookTeacherPlugin::create()->uninstall(); NotebookTeacherPlugin::create()->uninstall();

7
plugin/notebookteacher/update.php
Unescape View File

@ -6,10 +6,9 @@
* *
* @package chamilo.plugin.notebookteacher * @package chamilo.plugin.notebookteacher
*/ */
/**
* Initialization. require_once __DIR__.'/config.php';
*/
require_once __DIR__ . '/config.php';
if (!api_is_platform_admin()) { if (!api_is_platform_admin()) {
die('You must have admin permissions to install plugins'); die('You must have admin permissions to install plugins');
} }

Write Preview
Loading…
Cancel
Save