From 289550f8c6339787716d5b2d8217db644d71e551 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Wed, 27 Apr 2016 15:22:19 +0200 Subject: [PATCH 01/20] Adding extldap message see BT#10674 --- main/auth/lostPassword.php | 22 ++++++++++++++-------- main/inc/lib/login.lib.php | 26 ++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php index 6eff83594b..05f4a4272e 100755 --- a/main/auth/lostPassword.php +++ b/main/auth/lostPassword.php @@ -45,7 +45,7 @@ if ($reset && $userId) { } Display::addFlash( - Display::return_message($messageText) + Display::return_message($messageText, 'info', false) ); header('Location: ' . api_get_path(WEB_PATH)); exit; @@ -72,7 +72,7 @@ if ($form->validate()) { } Display::addFlash( - Display::return_message($messageText, 'error') + Display::return_message($messageText, 'error', false) ); header('Location: ' . api_get_self()); exit; @@ -92,7 +92,15 @@ if ($form->validate()) { } Display::addFlash( - Display::return_message($messageText) + Display::return_message($messageText, 'info', false) + ); + header('Location: ' . api_get_path(WEB_PATH)); + exit; + } + + if ($user['auth_source'] == 'extldap') { + Display::addFlash( + Display::return_message(get_lang('CouldNotResetPassword'), 'info', false) ); header('Location: ' . api_get_path(WEB_PATH)); exit; @@ -101,11 +109,9 @@ if ($form->validate()) { $userResetPasswordSetting = api_get_setting('user_reset_password'); if ($userResetPasswordSetting === 'true') { - $user = Database::getManager() - ->getRepository('ChamiloUserBundle:User') - ->find($user['uid']); + $userObj = Database::getManager()->getRepository('ChamiloUserBundle:User')->find($user['uid']); - Login::sendResetEmail($user, true); + Login::sendResetEmail($userObj, true); if (CustomPages::enabled() && CustomPages::exists(CustomPages::INDEX_UNLOGGED)) { CustomPages::display( @@ -130,7 +136,7 @@ if ($form->validate()) { } Display::addFlash( - Display::return_message($messageText) + Display::return_message($messageText, 'info', false) ); header('Location: ' . api_get_path(WEB_PATH)); exit; diff --git a/main/inc/lib/login.lib.php b/main/inc/lib/login.lib.php index ac7d69c0ad..7b15c31b71 100755 --- a/main/inc/lib/login.lib.php +++ b/main/inc/lib/login.lib.php @@ -155,7 +155,7 @@ class Login ); $email_admin = api_get_setting('emailAdministrator'); $email_body = nl2br($email_body); - + $result = @api_mail_html( '', $email_to, @@ -245,7 +245,8 @@ class Login firstname AS firstName, username AS loginName, password, - email + email, + auth_source FROM " . $tbl_user . " WHERE user_id = $id"; $result = Database::query($sql); @@ -253,6 +254,11 @@ class Login if ($result && $num_rows > 0) { $user = Database::fetch_array($result); + + if ($user['auth_source'] == 'extldap') { + + return get_lang('CouldNotResetPassword'); + } } else { return get_lang('CouldNotResetPassword'); } @@ -853,8 +859,19 @@ class Login } $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); - $query = "SELECT user_id AS uid, lastname AS lastName, firstname AS firstName, username AS loginName, password, email, - status AS status, official_code, phone, picture_uri, creator_id + $query = "SELECT + user_id AS uid, + lastname AS lastName, + firstname AS firstName, + username AS loginName, + password, + email, + status AS status, + official_code, + phone, + picture_uri, + creator_id, + auth_source FROM $tbl_user WHERE ( $condition AND active = 1) "; $result = Database::query($query); @@ -862,6 +879,7 @@ class Login if ($result && $num_rows > 0) { return Database::fetch_assoc($result); } + return false; } } From 284d08e2e2058c13c59a3030c8ce919971fa549f Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Wed, 27 Apr 2016 15:26:31 +0200 Subject: [PATCH 02/20] Minor - Change message --- main/auth/lostPassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php index 05f4a4272e..eeac0d41a8 100755 --- a/main/auth/lostPassword.php +++ b/main/auth/lostPassword.php @@ -100,7 +100,7 @@ if ($form->validate()) { if ($user['auth_source'] == 'extldap') { Display::addFlash( - Display::return_message(get_lang('CouldNotResetPassword'), 'info', false) + Display::return_message(get_lang('CouldNotResetPasswordBecauseLDAP'), 'info', false) ); header('Location: ' . api_get_path(WEB_PATH)); exit; From 23ef568c5130f78df9eb3596565333230f26a48c Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 27 Apr 2016 10:25:39 -0500 Subject: [PATCH 03/20] Fix LP view on ecf16fb - refs BT#11021 --- main/newscorm/resourcelinker.inc.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/main/newscorm/resourcelinker.inc.php b/main/newscorm/resourcelinker.inc.php index 179478493a..1366b68595 100755 --- a/main/newscorm/resourcelinker.inc.php +++ b/main/newscorm/resourcelinker.inc.php @@ -1616,6 +1616,8 @@ function rl_get_resource_link_for_learnpath($course_id, $learnpath_id, $id_in_pa $id_in_path = intval($id_in_path); $lpViewId = intval($lpViewId); + $em = Database::getManager(); + $sql = "SELECT * FROM $tbl_lp_item WHERE c_id = $course_id AND @@ -1701,22 +1703,27 @@ function rl_get_resource_link_for_learnpath($course_id, $learnpath_id, $id_in_pa '&lp=true'; break; case TOOL_DOCUMENT: - $documentInfo = DocumentManager::get_document_data_by_id( - $id, - $course_code, - true, - $session_id - ); - $documentPathInfo = pathinfo($documentInfo['absolute_path']); + $document = $em + ->getRepository('ChamiloCourseBundle:CDocument') + ->findOneBy(['cId' => $course_id, 'id' => $id]); + + if (!$document) { + break; + } + + $documentPathInfo = pathinfo($document->getPath()); $jplayer_supported_files = ['mp4', 'ogv', 'flv', 'm4v']; $extension = isset($documentPathInfo['extension']) ? $documentPathInfo['extension'] : ''; $showDirectUrl = !in_array($extension, $jplayer_supported_files); if ($showDirectUrl) { - $link = $documentInfo['direct_url'] . '?'; - $link .= http_build_query(['cidReq' => $course_code, 'id_session' => $session_id]); + $link = $main_course_path . 'document' . $document->getPath() . '?' . api_get_cidreq(); } else { - $link = $documentInfo['url'] . '&' . http_build_query(['origin' => 'learnpathitem']); + $link = api_get_path(WEB_CODE_PATH) . 'document/showinframes.php?' . http_build_query([ + 'cidReq' => $course_code, + 'id' => $id, + 'origin' => 'learnpathitem' + ]); } $openmethod = 2; From aa21c8774ae673d8f43cfc3f5c8b91b68f7fec1f Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Thu, 28 Apr 2016 08:45:39 +0200 Subject: [PATCH 04/20] Fix forum HTML description see #8214 --- main/forum/index.php | 3 +-- main/forum/viewforum.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/forum/index.php b/main/forum/index.php index 3594a60c0b..15d96ee254 100755 --- a/main/forum/index.php +++ b/main/forum/index.php @@ -514,10 +514,9 @@ if (is_array($forumCategories)) { ); $html .= '

' . $iconForum . $linkForum . '

'; - $html .= Display::tag( 'p', - strip_tags($forum['forum_comment']), + Security::remove_XSS($forum['forum_comment']), array( 'class'=>'description' ) diff --git a/main/forum/viewforum.php b/main/forum/viewforum.php index 3792f3590f..965bb975e2 100755 --- a/main/forum/viewforum.php +++ b/main/forum/viewforum.php @@ -410,7 +410,7 @@ if ($origin != 'learnpath') { if (!empty($descriptionForum)) { $html .= Display::tag( 'p', - strip_tags($descriptionForum), + Security::remove_XSS($descriptionForum), array( 'class' => 'description', ) From bc8e0a49b8da0f20d5886b4c74cb8dee48cbee5e Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Thu, 28 Apr 2016 08:45:59 +0200 Subject: [PATCH 05/20] Fix thread creation --- main/forum/forumfunction.inc.php | 4 ++-- main/forum/index.php | 2 +- main/forum/newthread.php | 7 +------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index b7b1385606..68a7e0acd9 100755 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -2939,8 +2939,8 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id = return false; } Security::clear_token(); - - return $values; + + store_thread($current_forum, $values); } } else { $token = Security::get_token(); diff --git a/main/forum/index.php b/main/forum/index.php index 15d96ee254..631eb42060 100755 --- a/main/forum/index.php +++ b/main/forum/index.php @@ -524,7 +524,7 @@ if (is_array($forumCategories)) { $html .= ''; $html .= ''; - $iconEmpty=''; + $iconEmpty = ''; // The number of topics and posts. if ($forum['forum_of_group'] !== '0') { diff --git a/main/forum/newthread.php b/main/forum/newthread.php index ab266611a8..fc85151e37 100755 --- a/main/forum/newthread.php +++ b/main/forum/newthread.php @@ -167,7 +167,7 @@ echo ''; // Set forum attachment data into $_SESSION getAttachedFiles($current_forum['forum_id'], 0, 0); -$values = show_add_post_form( +show_add_post_form( $current_forum, $forum_setting, 'newthread', @@ -175,11 +175,6 @@ $values = show_add_post_form( isset($_SESSION['formelements']) ? $_SESSION['formelements'] : null ); -if (!empty($values) && isset($values['SubmitPost'])) { - // Add new thread in table forum_thread. - store_thread($current_forum, $values); -} - if (isset($origin) && $origin == 'learnpath') { Display::display_reduced_footer(); } else { From 35dcc6ca980e1be18b3060f5c5af95a0b67ef8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= Date: Fri, 29 Apr 2016 16:42:15 -0500 Subject: [PATCH 06/20] Fix announcement email attachment - Refs#8154 --- main/inc/lib/message.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index ef12ab20b5..71e51788f3 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -438,7 +438,7 @@ class MessageManager $receiver_user_id, $subject, $message, - [], + $_FILES ? $_FILES : [], [], null, null, From f1c94b89ed228cdab048a60cd7bbfe751b4ae1ff Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 29 Apr 2016 16:51:05 -0500 Subject: [PATCH 07/20] Fix mirations for extra fields - refs #8200 --- app/Migrations/Schema/V110/Version20150609113500.php | 4 ++-- app/Migrations/Schema/V110/Version20150616093200.php | 4 ++-- app/Migrations/Schema/V110/Version20150624164100.php | 4 ++-- app/Migrations/Schema/V110/Version20150625155000.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Migrations/Schema/V110/Version20150609113500.php b/app/Migrations/Schema/V110/Version20150609113500.php index 77e7a93b79..d87d7ab1a5 100644 --- a/app/Migrations/Schema/V110/Version20150609113500.php +++ b/app/Migrations/Schema/V110/Version20150609113500.php @@ -17,8 +17,8 @@ class Version20150609113500 extends AbstractMigrationChamilo public function up(Schema $schema) { $this->addSql("INSERT INTO extra_field - (extra_field_type, field_type, variable, display_text, visible, changeable) - VALUES (2, 10, 'tags', 'Tags', 1, 1)"); + (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) + VALUES (2, 10, 'tags', 'Tags', 1, 1, NOW())"); } /** diff --git a/app/Migrations/Schema/V110/Version20150616093200.php b/app/Migrations/Schema/V110/Version20150616093200.php index a591aa0a36..9a5690fcd1 100644 --- a/app/Migrations/Schema/V110/Version20150616093200.php +++ b/app/Migrations/Schema/V110/Version20150616093200.php @@ -17,8 +17,8 @@ class Version20150616093200 extends AbstractMigrationChamilo public function up(Schema $schema) { $this->addSql("INSERT INTO extra_field ( - extra_field_type, field_type, variable, display_text, visible, changeable) - VALUES (2, 19, 'video_url', 'VideoUrl', 1, 1)"); + extra_field_type, field_type, variable, display_text, visible, changeable, created_at) + VALUES (2, 19, 'video_url', 'VideoUrl', 1, 1, NOW())"); } /** diff --git a/app/Migrations/Schema/V110/Version20150624164100.php b/app/Migrations/Schema/V110/Version20150624164100.php index 8759e68094..81838ed80b 100644 --- a/app/Migrations/Schema/V110/Version20150624164100.php +++ b/app/Migrations/Schema/V110/Version20150624164100.php @@ -17,8 +17,8 @@ class Version20150624164100 extends AbstractMigrationChamilo public function up(Schema $schema) { $this->addSql("INSERT INTO extra_field - (extra_field_type, field_type, variable, display_text, visible, changeable) - VALUES (3, 16, 'image', 'Image', 1, 1)"); + (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) + VALUES (3, 16, 'image', 'Image', 1, 1, NOW())"); } /** diff --git a/app/Migrations/Schema/V110/Version20150625155000.php b/app/Migrations/Schema/V110/Version20150625155000.php index 3117591074..2a1a328099 100644 --- a/app/Migrations/Schema/V110/Version20150625155000.php +++ b/app/Migrations/Schema/V110/Version20150625155000.php @@ -17,8 +17,8 @@ class Version20150625155000 extends AbstractMigrationChamilo public function up(Schema $schema) { $this->addSql("INSERT INTO extra_field - (extra_field_type, field_type, variable, display_text, visible, changeable) - VALUES (1, 1, 'captcha_blocked_until_date', 'Account locked until', 0, 0)"); + (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) + VALUES (1, 1, 'captcha_blocked_until_date', 'Account locked until', 0, 0, NOW())"); } /** From 88842fd706130a593d2a5e95cd37784a4d0de389 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 29 Apr 2016 18:20:06 -0500 Subject: [PATCH 08/20] Allow to platform admin manage all sessions - refs BT#11141 --- main/inc/lib/sessionmanager.lib.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 5e1ebc8430..230338c992 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1474,6 +1474,7 @@ class SessionManager $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); $tbl_url_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $tbl_item_properties = Database::get_course_table(TABLE_ITEM_PROPERTY); + $em = Database::getManager(); $userId = api_get_user_id(); @@ -1486,10 +1487,16 @@ class SessionManager } if (SessionManager::allowed($id_checked) && !$from_ws) { - $sql = 'SELECT session_admin_id FROM ' . $tbl_session. ' - WHERE id IN (' . $id_checked.')'; - $rs = Database::query($sql); - if (Database::result($rs, 0, 0) != $userId) { + $qb = $em + ->createQuery(' + SELECT s.sessionAdminId FROM ChamiloCoreBundle:Session s + WHERE s.id = ?1 + ') + ->setParameter(1, $id_checked); + + $res = $qb->getSingleScalarResult(); + + if ($res != $userId) { api_not_allowed(true); } } @@ -3878,6 +3885,10 @@ class SessionManager return false; } + if (api_is_platform_admin()) { + return true; + } + $userId = api_get_user_id(); if (api_is_session_admin() && From eaeadc65c19b1bd24a5e765e2d5baafbf096b728 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Fri, 29 Apr 2016 18:21:55 -0500 Subject: [PATCH 09/20] Fix Nginx rewrite example for issued badges page - refs CT#8207 --- documentation/installation_guide.html | 4 ++-- documentation/installation_guide_es_ES.html | 4 ++-- documentation/installation_guide_fr_FR.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html index 109d778483..7809bae2a6 100755 --- a/documentation/installation_guide.html +++ b/documentation/installation_guide.html @@ -701,7 +701,8 @@ If you have issues with files taking a long time to download, make sure you reco location / { rewrite ^/courses/([^/]+)/$ /main/course_home/course_home.php?cDir=$1 last; - rewrite ^/courses/([^/]+)/index.php$ main/course_home/course_home.php?cDir=$1 last; + rewrite ^/courses/([^/]+)/index.php$ /main/course_home/course_home.php?cDir=$1 last; + rewrite ^/badge/(\d+)/user/(\d+)$ /main/badge/issued.php?skill=$1&user=$2 last; try_files $uri @rewrite; } @@ -717,7 +718,6 @@ If you have issues with files taking a long time to download, make sure you reco rewrite ^/courses/([^/]+)/$ /main/course_home/course_home.php?cDir=$1 last; rewrite ^/courses/([^/]+)/index.php$ /main/course_home/course_home.php?cDir=$1 last; rewrite ^/session/([^/]+)/about/?$ /main/session/about.php?session_id=$1 last; - rewrite "^/badge/(\d{1,})/user/(\d{1,})$" main/badge/issued.php?skill=$1&user=$2 last; fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.*)$; diff --git a/documentation/installation_guide_es_ES.html b/documentation/installation_guide_es_ES.html index bdacbfe6a8..bb276d151c 100755 --- a/documentation/installation_guide_es_ES.html +++ b/documentation/installation_guide_es_ES.html @@ -694,7 +694,8 @@ por ejemplo. El efecto debería ser inmediato. location / { rewrite ^/courses/([^/]+)/$ /main/course_home/course_home.php?cDir=$1 last; - rewrite ^/courses/([^/]+)/index.php$ main/course_home/course_home.php?cDir=$1 last; + rewrite ^/courses/([^/]+)/index.php$ /main/course_home/course_home.php?cDir=$1 last; + rewrite ^/badge/(\d+)/user/(\d+)$ /main/badge/issued.php?skill=$1&user=$2 last; try_files $uri @rewrite; } @@ -710,7 +711,6 @@ por ejemplo. El efecto debería ser inmediato. rewrite ^/courses/([^/]+)/$ /main/course_home/course_home.php?cDir=$1 last; rewrite ^/courses/([^/]+)/index.php$ /main/course_home/course_home.php?cDir=$1 last; rewrite ^/session/([^/]+)/about/?$ /main/session/about.php?session_id=$1 last; - rewrite "^/badge/(\d{1,})/user/(\d{1,})$" main/badge/issued.php?skill=$1&user=$2 last; fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.*)$; diff --git a/documentation/installation_guide_fr_FR.html b/documentation/installation_guide_fr_FR.html index 540a9210e2..d5b47602ad 100644 --- a/documentation/installation_guide_fr_FR.html +++ b/documentation/installation_guide_fr_FR.html @@ -760,7 +760,8 @@ Ce sont uniquement les redirections à placer dans un bloc server{}, comme les a location / { rewrite ^/courses/([^/]+)/$ /main/course_home/course_home.php?cDir=$1 last; - rewrite ^/courses/([^/]+)/index.php$ main/course_home/course_home.php?cDir=$1 last; + rewrite ^/courses/([^/]+)/index.php$ /main/course_home/course_home.php?cDir=$1 last; + rewrite ^/badge/(\d+)/user/(\d+)$ /main/badge/issued.php?skill=$1&user=$2 last; try_files $uri @rewrite; } @@ -776,7 +777,6 @@ Ce sont uniquement les redirections à placer dans un bloc server{}, comme les a rewrite ^/courses/([^/]+)/$ /main/course_home/course_home.php?cDir=$1 last; rewrite ^/courses/([^/]+)/index.php$ /main/course_home/course_home.php?cDir=$1 last; rewrite ^/session/([^/]+)/about/?$ /main/session/about.php?session_id=$1 last; - rewrite "^/badge/(\d{1,})/user/(\d{1,})$" main/badge/issued.php?skill=$1&user=$2 last; fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.*)$; From 1d609c992d91c45dd5995e0e5fde6b5d29714529 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 29 Apr 2016 18:30:02 -0500 Subject: [PATCH 10/20] Fix allow delete session to platform admin when he is different of session_admin_id - refs BT#11141 --- main/inc/lib/sessionmanager.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 230338c992..3fa467741e 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -1496,7 +1496,7 @@ class SessionManager $res = $qb->getSingleScalarResult(); - if ($res != $userId) { + if ($res != $userId && !api_is_platform_admin()) { api_not_allowed(true); } } From c5b4291d7868ddeea74ea2e04da27b18686c04c5 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Fri, 29 Apr 2016 18:46:55 -0500 Subject: [PATCH 11/20] Fix userID reference in getJoinMeetingURL() for BBB plugin - refs CT#8196 --- plugin/bbb/lib/bbb_api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/bbb/lib/bbb_api.php b/plugin/bbb/lib/bbb_api.php index 84d958e3bc..9674c16d4f 100755 --- a/plugin/bbb/lib/bbb_api.php +++ b/plugin/bbb/lib/bbb_api.php @@ -213,7 +213,7 @@ class BigBlueButtonBN { 'meetingID='.urlencode($this->_meetingId). '&fullName='.urlencode($this->_username). '&password='.urlencode($this->_password). - '&userID='.urlencode($joinParams['userId']). + '&userID='.urlencode($joinParams['userID']). '&webVoiceConf='.urlencode($joinParams['webVoiceConf']); // Only use createTime if we really want to use it. If it's '', then don't pass it: if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) { From 31087ada24f0a820aa01a1527da0cf369f703ed9 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 1 May 2016 00:06:05 -0500 Subject: [PATCH 12/20] Update language terms --- main/lang/english/trad4all.inc.php | 2 ++ main/lang/french/trad4all.inc.php | 2 ++ main/lang/spanish/trad4all.inc.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index d086f25363..90c107097f 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -7645,4 +7645,6 @@ $MyLocation = "My location"; $ShowCourseInUserLanguage = "Show course in user's language"; $AccessData = "Access data"; $InvalidImageDimensions = "Image dimensions do not match the requirements. Please check the suggestions next to the image field."; +$CouldNotResetPasswordBecauseLDAP = "Could not reset password, contact your helpdesk."; +$Quote = "Quote"; ?> \ No newline at end of file diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index 6a73647066..b1eeec4a5c 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -7632,4 +7632,6 @@ $MyLocation = "Ma position"; $ShowCourseInUserLanguage = "Afficher les cours dans la langue de l'utilisateur"; $AccessData = "Données d'accès"; $InvalidImageDimensions = "Dimensiones incorrectas de la imagen. Por favor, respete las sugerencias indicadas al lado del campo de imagen."; +$CouldNotResetPasswordBecauseLDAP = "Impossible de réinitialiser le mot de passe. Contactez votre équipe de support."; +$Quote = "Citer"; ?> \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index eb44d00ef8..1d181e3474 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -7669,4 +7669,6 @@ $Map = "Mapa"; $MyLocation = "Mi ubicación"; $ShowCourseInUserLanguage = "Mostrar el curso en el idioma del usuario"; $AccessData = "Datos de acceso"; +$InvalidImageDimensions = "Las dimensiones de la imagen no corresponden a los requerimientos. Por favor verifique las sugerencias cerca del campo de imagen."; +$Quote = "Citar"; ?> \ No newline at end of file From 3d9ba22f9e55e191659b3d48b16fdf05a6eabbff Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 1 May 2016 00:10:00 -0500 Subject: [PATCH 13/20] Add ignoring language updates in packaging script --- tests/scripts/packaging/gitlog.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/scripts/packaging/gitlog.php b/tests/scripts/packaging/gitlog.php index 04dcfe76c3..858a75c341 100644 --- a/tests/scripts/packaging/gitlog.php +++ b/tests/scripts/packaging/gitlog.php @@ -34,10 +34,16 @@ foreach ($logs as $log) { if ($showDate) { echo $log['date']->format('Y-m-d H:i:s').' '.substr($log['sha1'],0,8).PHP_EOL; } + // Check for messages to ignore... if (strncasecmp($log['message'], 'Minor', 5) === 0) { //Skip minor messages continue; } + if ($log['message'] == 'Update language terms') { + //Skip language update messages + continue; + } + // Look for tasks references $issueLink = ''; $matches = array(); if (preg_match_all('/((BT)?#(\d){2,5})/', $log['message'], $matches)) { From 5aaa2d297106e5b8af8c5fedf8f207e5d99a9015 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 2 May 2016 12:01:45 +0200 Subject: [PATCH 14/20] Fix creation --- main/newscorm/scorm.class.php | 46 ++++++++++++++++++++++++++++------- main/upload/form.scorm.php | 11 ++++++--- main/upload/index.php | 40 ++++++++++++------------------ 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/main/newscorm/scorm.class.php b/main/newscorm/scorm.class.php index b7ca66ba0c..42a8aec4cc 100755 --- a/main/newscorm/scorm.class.php +++ b/main/newscorm/scorm.class.php @@ -306,15 +306,43 @@ class scorm extends learnpath $row = Database::fetch_array($res_max); $dsp = $row[0] + 1; } - $myname = $oOrganization->get_name(); - $myname = api_utf8_decode($myname); - - $sql = "INSERT INTO $new_lp (c_id, lp_type, name, ref, description, path, force_commit, default_view_mod, default_encoding, js_lib,display_order, session_id, use_max_score)" . - "VALUES ($courseId , 2,'".$myname."', '".$oOrganization->get_ref()."','','".$this->subdir."', 0, 'embedded', '".$this->manifest_encoding."', 'scorm_api.php', $dsp, $sessionId, $userMaxScore)"; - if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting path: '. $sql, 0); } - - Database::query($sql); - $lp_id = Database::insert_id(); + $myname = api_utf8_decode($oOrganization->get_name()); + + $now = api_get_utc_datetime(); + + $params = [ + 'c_id' => $courseId, + 'lp_type' => 2, + 'name' => $myname, + 'ref' => $oOrganization->get_ref(), + 'description' => '', + 'path' => $this->subdir, + 'force_commit' => 0, + 'default_view_mod' => 'embedded', + 'default_encoding' => $this->manifest_encoding, + 'js_lib' => 'scorm_api.php', + 'display_order' => $dsp, + 'session_id' => $sessionId, + 'use_max_score' => $userMaxScore, + 'content_maker' => '', + 'content_license' => '', + 'debug' => 0, + 'theme' => '', + 'preview_image' => '', + 'author' => '', + 'prerequisite' => 0, + 'hide_toc_frame' => 0, + 'seriousgame_mode' => 0, + 'autolaunch' => 0, + 'category_id' => 0, + 'max_attempts' => 0, + 'subscribe_users' => 0, + 'created_on' => $now, + 'modified_on' => $now, + 'publicated_on' => $now + ]; + + $lp_id = Database::insert($new_lp, $params); if ($lp_id) { $sql = "UPDATE $new_lp SET id = iid WHERE iid = $lp_id"; diff --git a/main/upload/form.scorm.php b/main/upload/form.scorm.php index 635f8b2f78..d0f7565e55 100755 --- a/main/upload/form.scorm.php +++ b/main/upload/form.scorm.php @@ -37,21 +37,25 @@ function get_zip_files_in_garbage() { * Just display the form needed to upload a SCORM and give its settings */ $nameTools = get_lang("FileUpload"); -$interbreadcrumb[] = array("url" => "../newscorm/lp_controller.php?action=list", "name" => get_lang("ToolLearnpath")); +$interbreadcrumb[] = array( + "url" => api_get_path(WEB_CODE_PATH)."newscorm/lp_controller.php?action=list?".api_get_cidreq(), + "name" => get_lang("ToolLearnpath"), +); + Display::display_header($nameTools, "Path"); require_once '../newscorm/content_makers.inc.php'; require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; echo '
'; -echo ''. +echo ''. Display::return_icon('back.png', get_lang('ReturnToLearningPaths'), '', ICON_SIZE_MEDIUM).''; echo '
'; $form = new FormValidator( '', 'POST', - 'upload.php', + 'upload.php?'.api_get_cidreq(), '', array( 'id' => "upload_form", @@ -129,5 +133,4 @@ Display::display_normal_message( ); $form->display(); -// footer Display::display_footer(); diff --git a/main/upload/index.php b/main/upload/index.php index 52af28d81b..3778ec3587 100755 --- a/main/upload/index.php +++ b/main/upload/index.php @@ -15,35 +15,26 @@ * @package chamilo.upload */ -/** - * INIT SECTION -*/ -// global settings initialisation -// also provides access to main api (inc/lib/main_api.lib.php) require_once '../inc/global.inc.php'; -$htmlHeadXtra[] = -""; - -//$is_allowed_to_edit = api_is_allowed_to_edit(); -$is_allowed_to_edit = api_is_allowed_to_edit(null,true); -if(!$is_allowed_to_edit){ +$is_allowed_to_edit = api_is_allowed_to_edit(null, true); +if (!$is_allowed_to_edit) { api_not_allowed(true); } @@ -78,7 +69,6 @@ Event::event_access_tool(TOOL_UPLOAD); /** * Prepare the header */ - $htmlHeadXtra[] = ''; $htmlHeadXtra[] = '