Merge pull request #1786 from chamilo/scrutinizer-patch-1

Scrutinizer Auto-Fixes
pull/2487/head
Julio Montoya 9 years ago committed by GitHub
commit 8aa3ff83ae
  1. 4
      plugin/add_cas_login_button/plugin.php
  2. 8
      plugin/date/plugin.php
  3. 2
      plugin/ext_auth_chamilo_logout_button_behaviour/index.php
  4. 4
      plugin/follow_buttons/plugin.php
  5. 4
      plugin/openmeetings/lang/english.php
  6. 4
      plugin/openmeetings/lang/french.php
  7. 4
      plugin/openmeetings/lang/spanish.php
  8. 2
      plugin/openmeetings/lib/openmeetings_api.php
  9. 10
      plugin/pens/plugin.php
  10. 2
      plugin/share_buttons/plugin.php
  11. 4
      plugin/show_user_info/index.php
  12. 2
      plugin/show_user_info/lang/english.php
  13. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Minimal.php
  14. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php
  15. 10
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
  16. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/UniqueAnswerImage.php

@ -10,7 +10,7 @@
*/ */
//the plugin title //the plugin title
$plugin_info['title'] = 'Add a button to login using CAS'; $plugin_info['title'] = 'Add a button to login using CAS';
//the comments that go with the plugin //the comments that go with the plugin
$plugin_info['comment'] = "If CAS is activated, this plugin add a text and a button on the login page to login with CAS. Configure plugin to add title, comment and logo."; $plugin_info['comment'] = "If CAS is activated, this plugin add a text and a button on the login page to login with CAS. Configure plugin to add title, comment and logo.";
@ -38,4 +38,4 @@ $form->setDefaults($defaults);
$plugin_info['settings_form'] = $form; $plugin_info['settings_form'] = $form;
//set the templates that are going to be used //set the templates that are going to be used
$plugin_info['templates'] = array('template.tpl'); $plugin_info['templates'] = array('template.tpl');

@ -9,10 +9,10 @@
* Plugin details (must be present) * Plugin details (must be present)
*/ */
//the plugin title //the plugin title
$plugin_info['title']='Date'; $plugin_info['title'] = 'Date';
//the comments that go with the plugin //the comments that go with the plugin
$plugin_info['comment']="Multinational date display"; $plugin_info['comment'] = "Multinational date display";
//the plugin version //the plugin version
$plugin_info['version']='1.0'; $plugin_info['version'] = '1.0';
//the plugin author //the plugin author
$plugin_info['author']='Yannick Warnier'; $plugin_info['author'] = 'Yannick Warnier';

@ -7,7 +7,7 @@ if (!api_is_anonymous() &&
api_get_setting('cas_activate') == 'true' && api_get_setting('cas_activate') == 'true' &&
$_user['auth_source'] == CAS_AUTH_SOURCE $_user['auth_source'] == CAS_AUTH_SOURCE
) { ) {
$_template['show_message'] = true; $_template['show_message'] = true;
// the link URL // the link URL
$link_url = "#"; $link_url = "#";
if (!empty($plugin_info['settings']['ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_url'])) { if (!empty($plugin_info['settings']['ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_url'])) {

@ -23,7 +23,7 @@ $plugin_info['author'] = 'Julio Montoya';
$plugin_info['templates'] = array('template.tpl'); $plugin_info['templates'] = array('template.tpl');
//For bigger icons change this value to addthis_32x32_style //For bigger icons change this value to addthis_32x32_style
$plugin_info['icon_class'] = ''; $plugin_info['icon_class'] = '';
//To use vertical alignment change this value to //To use vertical alignment change this value to
$plugin_info['position'] = 'addthis_default_style'; //addthis_vertical_style $plugin_info['position'] = 'addthis_default_style'; //addthis_vertical_style

@ -23,7 +23,7 @@ $strings['VideoConferenceXCourseX'] = "Videoconference #%s course %s
$strings['VideoConferenceAddedToTheCalendar'] = "Videoconference added to the calendar"; $strings['VideoConferenceAddedToTheCalendar'] = "Videoconference added to the calendar";
$strings['VideoConferenceAddedToTheLinkTool'] = "Videoconference added to the link tool"; $strings['VideoConferenceAddedToTheLinkTool'] = "Videoconference added to the link tool";
$strings['GoToTheVideoConference'] = "Go to the videoconference"; $strings['GoToTheVideoConference'] = "Go to the videoconference";
$strings['Records'] = "Recording"; $strings['Records'] = "Recording";
$strings['Meeting'] = "Meeting"; $strings['Meeting'] = "Meeting";
@ -34,7 +34,7 @@ $strings['CopyToLinkTool'] = "Copy to link tool";
$strings['EnterConference'] = "Enter the videoconference"; $strings['EnterConference'] = "Enter the videoconference";
$strings['RecordList'] = "Recording list"; $strings['RecordList'] = "Recording list";
$strings['ServerIsNotRunning'] = "Videoconference server is not running"; $strings['ServerIsNotRunning'] = "Videoconference server is not running";
$strings['ServerIsNotConfigured'] = "Videoconference server is not configured"; $strings['ServerIsNotConfigured'] = "Videoconference server is not configured";
$strings['XUsersOnLine'] = "%s user(s) online"; $strings['XUsersOnLine'] = "%s user(s) online";

@ -16,7 +16,7 @@ $strings['VideoConferenceXCourseX'] = "Vidéoconférence #%s, cours
$strings['VideoConferenceAddedToTheCalendar'] = "Vidéoconférence ajoutée au calendrier"; $strings['VideoConferenceAddedToTheCalendar'] = "Vidéoconférence ajoutée au calendrier";
$strings['VideoConferenceAddedToTheLinkTool'] = "Vidéoconférence ajoutée comme lien. Vous pouvez éditer et publier le lien sur la page principale du cours depuis l'outil liens."; $strings['VideoConferenceAddedToTheLinkTool'] = "Vidéoconférence ajoutée comme lien. Vous pouvez éditer et publier le lien sur la page principale du cours depuis l'outil liens.";
$strings['GoToTheVideoConference'] = "Entrer dans la salle de conférence"; $strings['GoToTheVideoConference'] = "Entrer dans la salle de conférence";
$strings['Records'] = "Enregistrement"; $strings['Records'] = "Enregistrement";
$strings['Meeting'] = "Salle de conférence"; $strings['Meeting'] = "Salle de conférence";
@ -27,7 +27,7 @@ $strings['CopyToLinkTool'] = "Ajouter comme lien du cours";
$strings['EnterConference'] = "Entrer dans la salle de conférence"; $strings['EnterConference'] = "Entrer dans la salle de conférence";
$strings['RecordList'] = "Liste des enregistrements"; $strings['RecordList'] = "Liste des enregistrements";
$strings['ServerIsNotRunning'] = "Le serveur de vidéoconférence ne fonctionne pas"; $strings['ServerIsNotRunning'] = "Le serveur de vidéoconférence ne fonctionne pas";
$strings['ServerIsNotConfigured'] = "Le serveur de vidéoconférence n'est pas configuré correctement"; $strings['ServerIsNotConfigured'] = "Le serveur de vidéoconférence n'est pas configuré correctement";
$strings['XUsersOnLine'] = "%s utilisateurs dans la salle"; $strings['XUsersOnLine'] = "%s utilisateurs dans la salle";

@ -16,7 +16,7 @@ $strings['VideoConferenceXCourseX'] = "Videoconferencia #%s, curso %
$strings['VideoConferenceAddedToTheCalendar'] = "Videoconferencia añadida al calendario"; $strings['VideoConferenceAddedToTheCalendar'] = "Videoconferencia añadida al calendario";
$strings['VideoConferenceAddedToTheLinkTool'] = "Videoconferencia añadida como enlace. Puede editar y publicar el enlace en la página principal del curso desde la herramienta de enlace."; $strings['VideoConferenceAddedToTheLinkTool'] = "Videoconferencia añadida como enlace. Puede editar y publicar el enlace en la página principal del curso desde la herramienta de enlace.";
$strings['GoToTheVideoConference'] = "Ir a la videoconferencia"; $strings['GoToTheVideoConference'] = "Ir a la videoconferencia";
$strings['Records'] = "Grabación"; $strings['Records'] = "Grabación";
$strings['Meeting'] = "Sala de conferencia"; $strings['Meeting'] = "Sala de conferencia";
@ -27,7 +27,7 @@ $strings['CopyToLinkTool'] = "Añadir como enlace del curso";
$strings['EnterConference'] = "Entrar a la videoconferencia"; $strings['EnterConference'] = "Entrar a la videoconferencia";
$strings['RecordList'] = "Lista de grabaciones"; $strings['RecordList'] = "Lista de grabaciones";
$strings['ServerIsNotRunning'] = "El servidor de videoconferencia no está funcionando"; $strings['ServerIsNotRunning'] = "El servidor de videoconferencia no está funcionando";
$strings['ServerIsNotConfigured'] = "El servidor de videoconferencia no está configurado correctamente"; $strings['ServerIsNotConfigured'] = "El servidor de videoconferencia no está configurado correctamente";
$strings['XUsersOnLine'] = "%s usuario(s) en la sala"; $strings['XUsersOnLine'] = "%s usuario(s) en la sala";

@ -19,6 +19,6 @@ class OpenMeetingsAPI
{ {
$this->_user = CONFIG_OPENMEETINGS_USER; $this->_user = CONFIG_OPENMEETINGS_USER;
$this->_pass = CONFIG_OPENMEETINGS_PASS; $this->_pass = CONFIG_OPENMEETINGS_PASS;
$this->_serverBaseUrl = CONFIG_OPENMEETINGS_SERVER_URL; $this->_serverBaseUrl = CONFIG_OPENMEETINGS_SERVER_URL;
} }
} }

@ -24,13 +24,13 @@
*/ */
//the plugin title //the plugin title
$plugin_info['title']='PENS'; $plugin_info['title'] = 'PENS';
//the comments that go with the plugin //the comments that go with the plugin
$plugin_info['comment']="PENS implementation for Chamilo"; $plugin_info['comment'] = "PENS implementation for Chamilo";
//the locations where this plugin can be shown //the locations where this plugin can be shown
$plugin_info['location']=array(); $plugin_info['location'] = array();
//the plugin version //the plugin version
$plugin_info['version']='1.1'; $plugin_info['version'] = '1.1';
//the plugin author //the plugin author
$plugin_info['author']='Guillaume Viguier-Just, Yannick Warnier'; $plugin_info['author'] = 'Guillaume Viguier-Just, Yannick Warnier';
$plugin_info = PENSPlugin::create()->get_info(); $plugin_info = PENSPlugin::create()->get_info();

@ -17,4 +17,4 @@ $plugin_info['version'] = '1.0';
// The plugin author. // The plugin author.
$plugin_info['author'] = 'Julio Montoya'; $plugin_info['author'] = 'Julio Montoya';
// For bigger icons change this value to addthis_32x32_style // For bigger icons change this value to addthis_32x32_style
$plugin_info['icon_class'] = ''; $plugin_info['icon_class'] = '';

@ -1,9 +1,9 @@
<?php <?php
// A user must be logged in. // A user must be logged in.
$_template['show_message'] = false; $_template['show_message'] = false;
if (!api_is_anonymous()) { if (!api_is_anonymous()) {
$_template['show_message'] = true; $_template['show_message'] = true;
// Getting the current user id. // Getting the current user id.
$user_id = api_get_user_id(); $user_id = api_get_user_id();

@ -1,3 +1,3 @@
<?php <?php
$strings['WelcomeToChamiloUserX'] = "Welcome to Chamilo %s!"; $strings['WelcomeToChamiloUserX'] = "Welcome to Chamilo %s!";

@ -34,7 +34,7 @@ class Minimal extends Basic
], ],
[ [
'name' => 'links', 'name' => 'links',
'items' => [ 'Link', 'Unlink', 'Anchor'] 'items' => ['Link', 'Unlink', 'Anchor']
] ]
]; ];

@ -54,7 +54,7 @@ class TestFreeAnswer extends Basic
['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord'], ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord'],
['Undo', 'Redo', '-', 'SelectAll', 'Find', '-', 'RemoveFormat'], ['Undo', 'Redo', '-', 'SelectAll', 'Find', '-', 'RemoveFormat'],
['Link', 'Unlink', 'Anchor', 'Glossary'], ['Link', 'Unlink', 'Anchor', 'Glossary'],
['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar', 'Asciimath',], ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar', 'Asciimath', ],
'/', '/',
['Table', '-', 'CreateDiv'], ['Table', '-', 'CreateDiv'],
['BulletedList', 'NumberedList', 'HorizontalRule', '-', 'Outdent', 'Indent', 'Blockquote'], ['BulletedList', 'NumberedList', 'HorizontalRule', '-', 'Outdent', 'Indent', 'Blockquote'],

@ -16,13 +16,13 @@ class TestQuestionDescription extends Basic
public function getConfig() public function getConfig()
{ {
$config['toolbarGroups'] = array( $config['toolbarGroups'] = array(
array('name' => 'document', 'groups' =>array('document', 'doctools')), array('name' => 'document', 'groups' =>array('document', 'doctools')),
array('name' => 'clipboard', 'groups' =>array('clipboard', 'undo')), array('name' => 'clipboard', 'groups' =>array('clipboard', 'undo')),
array('name' => 'editing', 'groups' =>array('clipboard', 'undo')), array('name' => 'editing', 'groups' =>array('clipboard', 'undo')),
//array('name' => 'forms', 'groups' =>array('clipboard', 'undo', )), //array('name' => 'forms', 'groups' =>array('clipboard', 'undo', )),
'/', '/',
array('name' => 'basicstyles', 'groups' =>array('basicstyles', 'cleanup')), array('name' => 'basicstyles', 'groups' =>array('basicstyles', 'cleanup')),
array('name' => 'paragraph', 'groups' =>array('list', 'indent', 'blocks', 'align')), array('name' => 'paragraph', 'groups' =>array('list', 'indent', 'blocks', 'align')),
array('name' => 'links'), array('name' => 'links'),
array('name' => 'insert'), array('name' => 'insert'),
'/', '/',

@ -18,8 +18,8 @@ class UniqueAnswerImage extends Basic
{ {
$config['toolbarGroups'] = array( $config['toolbarGroups'] = array(
'/', '/',
array('name' => 'basicstyles', 'groups' =>array('basicstyles', 'cleanup', )), array('name' => 'basicstyles', 'groups' =>array('basicstyles', 'cleanup',)),
array('name' => 'paragraph', 'groups' =>array('list', 'indent', 'blocks', 'align' )), array('name' => 'paragraph', 'groups' =>array('list', 'indent', 'blocks', 'align')),
array('name' => 'links'), array('name' => 'links'),
array('name' => 'insert'), array('name' => 'insert'),
'/', '/',

Loading…
Cancel
Save