diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index 639caac58f..2c513e8312 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -2751,7 +2751,13 @@ function show_add_form($id = '', $type = null)
- '.get_lang('Comment').' + +
+ +
+
'; } diff --git a/main/document/create_paint.php b/main/document/create_paint.php index 9c222f817b..ed2ea80654 100644 --- a/main/document/create_paint.php +++ b/main/document/create_paint.php @@ -162,7 +162,7 @@ else { $credentials="false"; } -$pixlr_url = 'http://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials; +$pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials; ?> diff --git a/main/document/edit_paint.php b/main/document/edit_paint.php index 8707ccfc33..51fd6058e4 100644 --- a/main/document/edit_paint.php +++ b/main/document/edit_paint.php @@ -214,7 +214,7 @@ $_SESSION['temp_realpath_image']=$to; //load image to url $to_url=api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip; $image=urlencode($to_url); -$pixlr_url = 'http://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials; +$pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials; //make frame an send image ?> diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index b516a9aea2..957eaeab48 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -1169,7 +1169,7 @@ class Exercise { $defaults['randomAnswers'] = $this->selectRandomAnswers(); $defaults['exerciseType'] = $this->selectType(); - $defaults['exerciseTitle'] = api_html_entity_decode($this->selectTitle()); + $defaults['exerciseTitle'] = $this->get_formated_title(); $defaults['exerciseDescription'] = $this->selectDescription(); $defaults['exerciseAttempts'] = $this->selectAttempts(); $defaults['exerciseFeedbackType'] = $this->selectFeedbackType(); @@ -1250,7 +1250,7 @@ class Exercise { */ function processCreation($form, $type = '') { - $this->updateTitle(api_htmlentities($form->getSubmitValue('exerciseTitle'))); + $this->updateTitle(Exercise::format_title_variable($form->getSubmitValue('exerciseTitle'))); $this->updateDescription($form->getSubmitValue('exerciseDescription')); $this->updateAttempts($form->getSubmitValue('exerciseAttempts')); $this->updateFeedbackType($form->getSubmitValue('exerciseFeedbackType')); @@ -3723,13 +3723,13 @@ class Exercise { $isRandomByCategory = $this->selectRandomByCat(); // on tri les categories en fonction du terme entre [] en tete de la description de la categorie /* - * ex de catégories : + * ex de catégories : * [biologie] Maitriser les mecanismes de base de la genetique * [biologie] Relier les moyens de depenses et les agents infectieux * [biologie] Savoir ou est produite l'enrgie dans les cellules et sous quelle forme * [chimie] Classer les molles suivant leur pouvoir oxydant ou reacteur - * [chimie] Connaître la denition de la theoie acide/base selon Brönsted - * [chimie] Connaître les charges des particules + * [chimie] Connaître la denition de la theoie acide/base selon Brönsted + * [chimie] Connaître les charges des particules * On veut dans l'ordre des groupes definis par le terme entre crochet au debut du titre de la categorie */ // If test option is Grouped By Categories @@ -3989,4 +3989,39 @@ class Exercise { } return $out_max_score; } + + /** + * @return string + */ + public function get_formated_title() + { + return api_html_entity_decode($this->selectTitle()); + } + + /** + * @param $in_title + * @return string + */ + public static function get_formated_title_variable($in_title) { + return api_html_entity_decode($in_title); + } + + /** + * @return string + */ + public function format_title() + { + return api_htmlentities($this->title); + } + + + /** + * @param $in_title + * @return string + */ + public static function format_title_variable($in_title) + { + return api_htmlentities($in_title); + } + } diff --git a/main/inc/ajax/lp.ajax.php b/main/inc/ajax/lp.ajax.php index 70029db07a..508803e9d5 100644 --- a/main/inc/ajax/lp.ajax.php +++ b/main/inc/ajax/lp.ajax.php @@ -17,7 +17,11 @@ switch ($action) { if ($_SESSION['oLP']) { //Updating the lp.modified_on $_SESSION['oLP']->set_modified_on(); - echo $_SESSION['oLP']->add_item($_REQUEST['parent_id'], $_REQUEST['previous_id'], $_REQUEST['type'], $_REQUEST['id'], $_REQUEST['title'], null); + $title = $_REQUEST['title']; + if ($_REQUEST['type'] == TOOL_QUIZ) { + $title = Exercise::format_title_variable($title); + } + echo $_SESSION['oLP']->add_item($_REQUEST['parent_id'], $_REQUEST['previous_id'], $_REQUEST['type'], $_REQUEST['id'], $title, null); } } break; diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index 53d8073eb0..98c562e111 100644 --- a/main/inc/lib/main_api.lib.php +++ b/main/inc/lib/main_api.lib.php @@ -6918,3 +6918,21 @@ function api_get_firstpage_parameter() { return $_COOKIE['GotoCourse']; } + +/** + * Return true on https install + * @return boolean + */ +function api_is_https() +{ + return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'); +} + +/** + * Return protocol (http or https) + * @return string + */ +function api_get_protocol() +{ + return api_is_https() ? 'https' : 'http'; +} diff --git a/main/inc/lib/nanogong/LICENSE.txt b/main/inc/lib/nanogong/LICENSE similarity index 98% rename from main/inc/lib/nanogong/LICENSE.txt rename to main/inc/lib/nanogong/LICENSE index 29f81d812f..261eeb9e9f 100644 --- a/main/inc/lib/nanogong/LICENSE.txt +++ b/main/inc/lib/nanogong/LICENSE @@ -1,201 +1,201 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/main/inc/lib/nanogong/NOTICE.txt b/main/inc/lib/nanogong/NOTICE similarity index 85% rename from main/inc/lib/nanogong/NOTICE.txt rename to main/inc/lib/nanogong/NOTICE index a2eb10a0ab..7158735412 100644 --- a/main/inc/lib/nanogong/NOTICE.txt +++ b/main/inc/lib/nanogong/NOTICE @@ -1,11 +1,11 @@ -The NanoGong Applet 4.2 -Copyright 2002-2011 The Gong Project - -This product includes software developed by the Gong Project -(http://gong.ust.hk/) at the Department of Computer Science and Engineering at -the Hong Kong University of Science and Technology. - -The Speex speech codec is provided by the JSpeex library package, which is open -source software, written by Marc Gimpel, and copyright by Wimba S.A. The -original software is available from http://jspeex.sourceforge.net/ - +The NanoGong Applet 5.0 +Copyright 2002-2014 The Gong Project + +This product includes software developed by the Gong Project +(http://gong.ust.hk/) at the Department of Computer Science and Engineering at +the Hong Kong University of Science and Technology. + +The Speex speech codec is provided by the JSpeex library package, which is open +source software, written by Marc Gimpel, and copyright by Wimba S.A. The +original software is available from http://jspeex.sourceforge.net/ + diff --git a/main/inc/lib/nanogong/README b/main/inc/lib/nanogong/README new file mode 100644 index 0000000000..d647c6dfd5 --- /dev/null +++ b/main/inc/lib/nanogong/README @@ -0,0 +1,39 @@ +Thank you for downloading the NanoGong applet! + +Use the NanoGong Applet +----------------------- + +NanoGong is a 'simple' Java applet which you can put in any web page. We have +included an example index.html at the root directory so that you can quickly +make a web page with NanoGong by modifying the given page. + +Here are the brief steps to create your NanoGong page: + +1) Modify the index.html with appropriate content, you may change the filename + as well if you want to +2) Copy both index.html and nanogong.jar to the location where you usually put + your web pages in +3) Open a browser and type in the location of the index.html you have just + uploaded + +Done! In just 3 steps you will have a NanoGong page ready on the Web. + +If you want to look at more examples on using the NanoGong applet you can visit +the NanoGong project website at + + http://nanogong.ust.hk/ + + +Build the NanoGong Applet +------------------------- + +This package contains the necessary source code for creating your own version of +NanoGong applet. The JSpeex library is provided in binary form inside the jspeex +directory. The build file, build.xml, at the root directory can be used to +compile the source code as well as pack the resulting class files together with +the JSpeex library in a Jar file. + +To sign the Jar file, which is necessary for the proper execution of the +NanoGong applet, you can either provide a keystore file called 'keystore.jks', +or sign the Jar file manually. Please refer to the build file for details. + diff --git a/main/inc/lib/nanogong/nanogong.jar b/main/inc/lib/nanogong/nanogong.jar index fc058baa60..bda6a7d029 100644 Binary files a/main/inc/lib/nanogong/nanogong.jar and b/main/inc/lib/nanogong/nanogong.jar differ diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index cbc2d37878..a7b5bac052 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -5838,15 +5838,20 @@ class learnpath $arrLP = $this->arrMenu; unset ($this->arrMenu); - if ($action == 'add') + if ($action == 'add') { $legend .= get_lang('CreateTheExercise') . ' :'; - elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise') . ' :'; - else + } elseif ($action == 'move') { + $legend .= get_lang('MoveTheCurrentExercise') . ' :'; + } else { $legend .= get_lang('EditCurrentExecice') . ' :'; + } + if (isset ($_GET['edit']) && $_GET['edit'] == 'true') { $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument')); } + $legend .= ''; + $return = ''; $return .= '
'; $return .= '
'; @@ -5865,6 +5870,7 @@ class learnpath $return .= ''; $return .= ''; + // Select for Parent item, root or chapter $return .= ''; - $return .= ''; - for ($i = 0; $i < count($arrLP); $i++) { if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) { if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) @@ -5908,12 +5912,11 @@ class learnpath elseif ($action == 'add') $selected = 'selected="selected" '; else $selected = ''; - $return .= ''; } } - $return .= ''; + $return .= ''; $return .= ''; if ($action != 'move') { @@ -7585,7 +7588,10 @@ class learnpath * * @return string */ + + public function get_js_dropdown_array() { + $course_id = api_get_course_int_id(); $return = 'var child_name = new Array();' . "\n"; @@ -7602,7 +7608,10 @@ class learnpath $i = 0; while ($row_zero = Database :: fetch_array($res_zero)) { - $js_var = json_encode(get_lang('After').' '.$row_zero['title']); + if ($row_zero['item_type'] == TOOL_QUIZ) { + $row_zero['title'] = Exercise::get_formated_title_variable($row_zero['title']); + } + $js_var = json_encode(get_lang('After').' '.$row_zero['title']); $return .= 'child_name[0][' . $i . '] = '.$js_var.' ;' . "\n"; $return .= 'child_value[0][' . $i++ . '] = "' . $row_zero['id'] . '";' . "\n"; } @@ -7620,7 +7629,7 @@ class learnpath $return .= 'child_value[' . $row['id'] . '] = new Array();' . "\n\n"; while ($row_parent = Database :: fetch_array($res_parent)) { - $js_var = json_encode(get_lang('After').' '.$row_parent['title']); + $js_var = json_encode(get_lang('After').' '.$row_parent['title']); $return .= 'child_name[' . $row['id'] . '][' . $i . '] = '.$js_var.' ;' . "\n"; $return .= 'child_value[' . $row['id'] . '][' . $i++ . '] = "' . $row_parent['id'] . '";' . "\n"; } diff --git a/main/newscorm/lp_controller.php b/main/newscorm/lp_controller.php index baeedff8ee..39b4eab816 100644 --- a/main/newscorm/lp_controller.php +++ b/main/newscorm/lp_controller.php @@ -326,7 +326,7 @@ if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $ if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id()); if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } - break; + break; case 2: if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id()); @@ -382,6 +382,15 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') { $action = (!empty($_REQUEST['action']) ? $_REQUEST['action'] : ''); +// format title to be displayed correctly if QUIZ +$post_title = ""; +if (isset($_POST['title'])) { + $post_title = $_POST['title']; + if (isset($_POST['type']) && isset($_POST['title']) && $_POST['type'] == TOOL_QUIZ && !empty($_POST['title'])) { + $post_title = Exercise::format_title_variable($_POST['title']); + } +} + switch ($action) { case 'add_item': if (!$is_allowed_to_edit) { @@ -396,7 +405,7 @@ switch ($action) { } else { $_SESSION['refresh'] = 1; - if (isset($_POST['submit_button']) && !empty($_POST['title'])) { + if (isset($_POST['submit_button']) && !empty($post_title)) { // If a title was sumbitted: //Updating the lp.modified_on @@ -406,6 +415,7 @@ switch ($action) { // Check post_time to ensure ??? (counter-hacking measure?) require 'lp_add_item.php'; } else { + $_SESSION['post_time'] = $_POST['post_time']; if ($_POST['type'] == TOOL_DOCUMENT) { if (isset($_POST['path']) && $_GET['edit'] != 'true') { @@ -413,10 +423,10 @@ switch ($action) { } else { $document_id = $_SESSION['oLP']->create_document($_course); } - $new_item_id = $_SESSION['oLP']->add_item($_POST['parent'], $_POST['previous'], $_POST['type'], $document_id, $_POST['title'], $_POST['description'], $_POST['prerequisites']); + $new_item_id = $_SESSION['oLP']->add_item($_POST['parent'], $_POST['previous'], $_POST['type'], $document_id, $post_title, $_POST['description'], $_POST['prerequisites']); } else { // For all other item types than documents, load the item using the item type and path rather than its ID. - $new_item_id = $_SESSION['oLP']->add_item($_POST['parent'], $_POST['previous'], $_POST['type'], $_POST['path'], $_POST['title'], $_POST['description'], $_POST['prerequisites'], $_POST['maxTimeAllowed']); + $new_item_id = $_SESSION['oLP']->add_item($_POST['parent'], $_POST['previous'], $_POST['type'], $_POST['path'], $post_title, $_POST['description'], $_POST['prerequisites'], $_POST['maxTimeAllowed']); } $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id); header('Location: '.$url); @@ -566,7 +576,7 @@ switch ($action) { if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; - if (isset($_POST['submit_button']) && !empty($_POST['title'])) { + if (isset($_POST['submit_button']) && !empty($post_title)) { //Updating the lp.modified_on $_SESSION['oLP']->set_modified_on(); @@ -576,7 +586,7 @@ switch ($action) { if (isset($_FILES['mp3'])) { $audio = $_FILES['mp3']; } - $_SESSION['oLP']->edit_item($_REQUEST['id'], $_POST['parent'], $_POST['previous'], $_POST['title'], $_POST['description'], $_POST['prerequisites'], $audio, $_POST['maxTimeAllowed']); + $_SESSION['oLP']->edit_item($_REQUEST['id'], $_POST['parent'], $_POST['previous'], $post_title, $_POST['description'], $_POST['prerequisites'], $audio, $_POST['maxTimeAllowed']); if (isset($_POST['content_lp'])) { $_SESSION['oLP']->edit_document($_course); @@ -631,8 +641,7 @@ switch ($action) { if (isset($_POST['submit_button'])) { //Updating the lp.modified_on $_SESSION['oLP']->set_modified_on(); - - $_SESSION['oLP']->edit_item($_GET['id'], $_POST['parent'], $_POST['previous'], $_POST['title'], $_POST['description']); + $_SESSION['oLP']->edit_item($_GET['id'], $_POST['parent'], $_POST['previous'], $post_title, $_POST['description']); $is_success = true; $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id); header('Location: '.$url);