Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

Author: ywarnier

app/Migrations/Schema/V110/Version110.php

@@ -34,9 +34,9 @@ public function up(Schema $schema)
         $this->addSql("CREATE TABLE IF NOT EXISTS c_student_publication_comment (id INT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL)");
         $this->addSql("CREATE TABLE IF NOT EXISTS c_attendance_calendar_rel_group (iid int NOT NULL auto_increment PRIMARY KEY, id INT, c_id INT NOT NULL, group_id INT NOT NULL, calendar_id INT NOT NULL)");
 
-        //$this->addSql("ALTER TABLE skill_rel_user ADD COLUMN course_id INT NOT NULL DEFAULT 0 AFTER id");
-        //$this->addSql("ALTER TABLE skill_rel_user ADD COLUMN session_id INT NOT NULL DEFAULT 0 AFTER course_id");
-        //$this->addSql("ALTER TABLE skill_rel_user ADD INDEX idx_select_cs (course_id, session_id)");
+        $this->addSql("ALTER TABLE skill_rel_user ADD COLUMN course_id INT NOT NULL DEFAULT 0 AFTER id");
+        $this->addSql("ALTER TABLE skill_rel_user ADD COLUMN session_id INT NOT NULL DEFAULT 0 AFTER course_id");
+        $this->addSql("ALTER TABLE skill_rel_user ADD INDEX idx_select_cs (course_id, session_id)");
 
         $table = $schema->getTable('session');
         if (!$table->hasColumn('description')) {

plugin/text/index.php

@@ -0,0 +1,10 @@
+<?php
+/* See license terms in /license.txt */
+
+/**
+ * @package chamilo.plugin.text
+ */
+
+if (!empty($plugin_info['settings']['text_content'])) {
+    echo $plugin_info['settings']['text_content'];
+}

plugin/text/install.php

@@ -0,0 +1,2 @@
+<?php
+/* See license terms in /license.txt */

plugin/text/plugin.php

@@ -0,0 +1,40 @@
+<?php
+/* See license terms in /license.txt */
+
+/**
+ * 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).
+ * These settings will be used in the administration interface for plugins (Chamilo configuration settings->Plugins)
+ * @package chamilo.plugin
+ * @author Julio Montoya <[email protected]>
+ */
+
+/* Plugin config */
+
+//the plugin title
+$plugin_info['title'] = 'Text';
+//the comments that go with the plugin
+$plugin_info['comment'] = "Displays a text message";
+//the plugin version
+$plugin_info['version'] = '1.0';
+//the plugin author
+$plugin_info['author'] = 'Julio Montoya';
+
+/* Plugin optional settings */
+
+$form = new FormValidator('text_form');
+$form->addTextarea('content', get_lang('Content'));
+$form->addButtonSave(get_lang('Save'), 'submit_button');
+
+$content = '';
+$setting = api_get_setting('text_content');
+
+if (!empty($setting) && is_array($setting)) {
+    if (isset($setting['text'])) {
+        $content = $setting['text'];
+    }
+}
+
+$form->setDefaults(array('content' => $content));
+
+$plugin_info['settings_form'] = $form;

plugin/text/readme.txt

@@ -0,0 +1,3 @@
+README
+
+Display a text in a region.

plugin/text/uninstall.php

@@ -0,0 +1,2 @@
+<?php
+/* See license terms in /license.txt */