From 4292a69177fb993561ad07aadce77fedfe0b4244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= Date: Mon, 28 Mar 2016 15:34:47 -0500 Subject: [PATCH 1/6] Fix attached files in mail - Refs # 8154 --- main/inc/lib/api.lib.php | 19 +++++++++++++++++-- main/inc/lib/message.lib.php | 9 ++++++++- main/inc/lib/notification.lib.php | 6 ++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 6479309d9c..835ae76ce8 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -7846,8 +7846,8 @@ function api_create_protected_dir($name, $parentDirectory) * @param string sender e-mail * @param array extra headers in form $headers = array($name => $value) to allow parsing * @param array data file (path and filename) - * @param array data to attach a file (optional) * @param bool True for attaching a embedded file inside content html (optional) + * @param array Additional parameters * @return returns true if mail was sent * @see class.phpmailer.php */ @@ -7968,7 +7968,22 @@ function api_mail_html( // Attachment ... if (!empty($data_file)) { - $mail->AddAttachment($data_file['path'], $data_file['filename']); + $o = 0; + foreach ($data_file as $file_attach) { + if (!empty($file_attach['path']) && !empty($file_attach['filename'])) { + $mail->AddAttachment($file_attach['path'], $file_attach['filename']); + } + $o++; + } + } elseif (is_array($_FILES)) { + $data_file = $_FILES; + $o = 0; + foreach ($data_file as $file_attach) { + if (!empty($file_attach['tmp_name']) && !empty($file_attach['name'])) { + $mail->AddAttachment($file_attach['tmp_name'], $file_attach['name']); + } + $o++; + } } // Only valid addresses are accepted. diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 6f12c553e7..d90b2e3873 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -362,6 +362,12 @@ class MessageManager // Load user settings. $notification = new Notification(); $sender_info = api_get_user_info($user_sender_id); + + // add file attachment additional attributes + foreach ($file_attachments as $file_attach) { + $file_attachments['path'] = $file_attach['tmp_name']; + $file_attachments['filename'] = $file_attach['name']; + } if (empty($group_id)) { $type = Notification::NOTIFICATION_TYPE_MESSAGE; @@ -373,7 +379,8 @@ class MessageManager array($receiver_user_id), $subject, $content, - $sender_info + $sender_info, + $file_attachments ); } else { $usergroup = new UserGroup(); diff --git a/main/inc/lib/notification.lib.php b/main/inc/lib/notification.lib.php index 2424572dd2..4c8aa9800d 100644 --- a/main/inc/lib/notification.lib.php +++ b/main/inc/lib/notification.lib.php @@ -227,7 +227,8 @@ class Notification extends Model $user_list, $title, $content, - $senderInfo = array() + $senderInfo = array(), + $attachments = array() ) { $this->type = intval($type); $content = $this->formatContent($content, $senderInfo); @@ -307,7 +308,8 @@ class Notification extends Model Security::filter_terms($content), $this->adminName, $this->adminEmail, - $extraHeaders + $extraHeaders, + $attachments ); } $sendDate = api_get_utc_datetime(); From d46b5c15141020c681d26fb46bd9242a6e5e12a1 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Tue, 29 Mar 2016 11:15:19 -0500 Subject: [PATCH 2/6] fixed css clock CT#8024 --- app/Resources/public/css/base.css | 33 +++++++++------------- main/exercice/exercise.class.php | 4 +-- main/template/default/layout/header.js.tpl | 6 ++-- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index e4ce229ebe..7a7d78f9d2 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -2043,7 +2043,6 @@ div.admin_section h4 { float: left; } - .ribbon .rib-success, .ribbon .ribbon-total-success{ background-color: #768E00; background-image: -ms-linear-gradient(top, #9CB80A, #768E00); @@ -2106,11 +2105,6 @@ div.admin_section h4 { .ribbon .rib::before {left: 0;} .ribbon .rib::after {right: 0;} - -.ribbon .success { - -} - .ribbon .error { color: red; } @@ -2129,28 +2123,30 @@ div.admin_section h4 { .exercise_save_now_button, .exercise_button{ /* padding:5px; */ } - -.time_container_warning { - background-color:#FFD700; - border:1px solid #B8860B; -} - /* Exercise clock*/ .count_down { padding: 3px; - font-size:22px; + font-size:20px; font-weight:bold; - color:#222; - padding: 12px; + color:#2E75A3; + padding: 5px; text-align: center; - width:200px; + margin-bottom: 10px; + background: url(../../main/img/clock-exercise.png) no-repeat center center #FFF; + border: 1px solid #DDD; + border-radius: 5px; +} +.count_down.navbar-fixed-top{ + border-radius: 0px; +} +.time_container_warning { + background: url(../../main/img/clock-exercise.png) no-repeat center center #FFD700; + border:1px solid #B8860B; } - .red_alert { color:red; font-weight: bold; } - #question_feedback { -webkit-border-radius: 10px; -moz-border-radius: 10px; @@ -2165,7 +2161,6 @@ div.admin_section h4 { margin-top:5px; padding:5px; } - .userportal-order-courses-link { background-color: #F9F9F9; border-radius: 10px 10px 10px 10px; diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index fa4f949fa2..c1750ec18f 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -5016,8 +5016,8 @@ class Exercise get_lang('YouWillBeRedirectedInXSeconds'), '' ); - $html .= ''; - $html .= '
'; + $html .= ''; + $html .= '
'; return $html; } diff --git a/main/template/default/layout/header.js.tpl b/main/template/default/layout/header.js.tpl index f2c4834164..cd31fab3cf 100644 --- a/main/template/default/layout/header.js.tpl +++ b/main/template/default/layout/header.js.tpl @@ -232,11 +232,11 @@ $(document).scroll(function() { } if (fixed.attr('data-top') - fixed.outerHeight() <= $(this).scrollTop()) { - fixed.addClass('subnav-fixed'); + fixed.addClass('navbar-fixed-top'); fixed.css('width', '100%'); } else { - fixed.removeClass('subnav-fixed'); - fixed.css('width', '200px'); + fixed.removeClass('navbar-fixed-top'); + fixed.css('width', '100%'); } } From a1f5d466b7baec90de31b31a40a09f606e728404 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Tue, 29 Mar 2016 11:17:11 -0500 Subject: [PATCH 3/6] add clock-exercise.png CT#8024 --- main/img/clock-exercise.png | Bin 0 -> 2042 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 main/img/clock-exercise.png diff --git a/main/img/clock-exercise.png b/main/img/clock-exercise.png new file mode 100644 index 0000000000000000000000000000000000000000..f59e9e484346032e3ed1b99e4b0af208ad3562d4 GIT binary patch literal 2042 zcmVny55&`bw%$H7T@BLR$)05pvW-X(Obhtx!Ws5-BM}wSUEu=QrEjg>EYrwW!#|?$^vG>1R#;Ev-1br1F z+{wVf2nU04`R|C&F-G{G9A@(Q_47N9r@H`~bzL)@tD3)^uQ-gC8H}$n!pSE?>7)z{ zCQK0@E2x4IzKa1*Z76FC-mHRb)-i54R~~v|u0-{{3`XH_=x+BEVxeyV=4O_`ujGLm z5-6qMOh>;K#K+JOT5y{HMLSQ85F^Dn@+rdDFlo;?VK zLZcdX27=(6LkNNPvw>0H2Lb^!G&JCgxnD)O|LaH!1xX?Mbne`mzH)3)nE}oz>bCF4ul2*sMqb0Mj({DJ38Pa%2};T3X=q`H+{FH)f-E_8&x! zKL^d*o&zNWvud8jy5Al^(c-FcJ9_BO$=I+s2b6k|G-EJ?RFsyAY?eU*z)0vBz|g&u zL!hgxYs`0>!}MelS~v_MhVHh4P;hQuvm;Xg0s^WjAt@Au6RvbkZEY4I0RUHx0eEBp zz$Gn?>gwuo8zj2UV)~)oc&*=q6{|M`t_++HoX6(cuVCg3|Cnt&4vNa#J&5QDL^%Z` z3PLd&O+!643y}c8h#PTa4ISu6L{L1=ytB8t5pB;sgQBTL*zxRI{Qht&5{8MowGX3w zPRVsUI~D7{Jm)kJ8Km}xWZN|j%{dKz!blj9ToM|41GvXG@>xZ2j*e}=MqtP5$gNt5 znH%ar6$Pb>7N*qM-}>5zUcze<;t6qV;>xgD5d{F**cj$9(P+-7+rlIQe_6@y(7JsC;jVBa}BbNYi3^UqI;#bQv^ z@gKVL3kvX??vL?qcRP%@j!4IVF1sDeCvNyQD;u#mUI8;rP)zLUK|@yb7peSiId^p#_? zl2M7%_x|;?vu0%^+8M4Ql#uh1ik-nW2mtfE*Yc-4p`5y4$h( zcms|_dXVTzAk@|;oKu`XkFVXZ<)&0+vxIS%5Z$kCS+4b~?=YDu-f5E|du8OvE-cF~ z#*(Z;l(;9uueiVn!9^{O&cqkZ&9yT3AEkQXFb;0*(wvhwOFTAN}6C z*0hY?W@$IH`NI3^mIYc|->ygX*`{Gq$;m)v1|~}Y1(^b literal 0 HcmV?d00001 From 55c17b801c573e1f65fd036efaf1cd114040d3db Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Tue, 29 Mar 2016 12:24:31 -0500 Subject: [PATCH 4/6] Fix Migrations - refs BT#10997 BT#10998 --- app/Migrations/Schema/V110/Version20151101082300.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Migrations/Schema/V110/Version20151101082300.php b/app/Migrations/Schema/V110/Version20151101082300.php index 710f9e1e29..32e35854cb 100644 --- a/app/Migrations/Schema/V110/Version20151101082300.php +++ b/app/Migrations/Schema/V110/Version20151101082300.php @@ -252,7 +252,6 @@ class Version20151101082300 extends AbstractMigrationChamilo $sessionRelUser->addColumn('moved_to', Type::INTEGER)->setNotnull(false); $sessionRelUser->addColumn('moved_status', Type::INTEGER)->setNotnull(false); $sessionRelUser->addColumn('moved_at', Type::DATETIME)->setNotnull(false); - $sessionRelUser->addColumn('duration', Type::INTEGER)->setNotnull(false); $sessionRelUser->addIndex(['session_id']); $sessionRelUser->addIndex(['user_id']); From cec0161eff56dd0a81c778bfe24a2e7d618f1691 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Tue, 29 Mar 2016 15:56:25 -0500 Subject: [PATCH 5/6] Fix create course when doesn't exists an admin with id 1 - refs #8166 --- main/inc/lib/add_course.lib.inc.php | 57 +++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 18b8ed7fbf..5cdb4d8404 100755 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -875,9 +875,21 @@ class AddCourse ); $image_id = Database:: insert_id(); - Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id,'document',1,'$now','$now',$image_id,'DocumentAdded',1,NULL,NULL,0)" + Database::insert( + $TABLEITEMPROPERTY, + [ + 'c_id' => $course_id, + 'tool' => 'document', + 'insert_user_id' => api_get_user_id(), + 'insert_date' => $now, + 'lastedit_date' => $now, + 'ref' => $image_id, + 'lastedit_type' => 'DocumentAdded', + 'lastedit_user_id' => api_get_user_id(), + 'to_group_id' => null, + 'to_user_id' => null, + 'visibility' => 0 + ] ); } } @@ -921,11 +933,22 @@ class AddCourse if ($path_documents . $value['file'] == '/certificates/default.html') { $example_cert_id = $image_id; } - Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id,'document',1,'$now','$now',$image_id,'DocumentAdded',1,NULL,NULL,1)" + $docId = Database::insert( + $TABLEITEMPROPERTY, + [ + 'c_id' => $course_id, + 'tool' => 'document', + 'insert_user_id' => api_get_user_id(), + 'insert_date' => $now, + 'lastedit_date' => $now, + 'ref' => $image_id, + 'lastedit_type' => 'DocumentAdded', + 'lastedit_user_id' => api_get_user_id(), + 'to_group_id' => null, + 'to_user_id' => null, + 'visibility' => 1 + ] ); - $docId = Database:: insert_id(); if ($docId) { $sql = "UPDATE $TABLEITEMPROPERTY SET id = iid WHERE iid = $docId"; Database::query($sql); @@ -1146,11 +1169,23 @@ class AddCourse $sql = "UPDATE $tableDocument SET id = iid WHERE iid = $docId"; Database::query($sql); - Database::query( - "INSERT INTO $tableItem (id, c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($counter, $course_id,'document',1,'$now', '$now', $docId, 'DocumentAdded', 1, NULL, NULL, 0)" + $id = Database::insert( + $tableItem, + [ + 'id' => $counter, + 'c_id' => $course_id, + 'tool' => 'document', + 'insert_user_id' => api_get_user_id(), + 'insert_date' => $now, + 'lastedit_date' => $now, + 'ref' => $docId, + 'lastedit_type' => 'DocumentAdded', + 'lastedit_user_id' => api_get_user_id(), + 'to_group_id' => null, + 'to_user_id' => null, + 'visibility' => 0 + ] ); - $id = Database:: insert_id(); if ($id) { $sql = "UPDATE $tableItem SET id = iid WHERE iid = $id"; Database::query($sql); From 8f652341004346d57558183aa9f9134a97a58339 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Tue, 29 Mar 2016 17:26:38 -0500 Subject: [PATCH 6/6] fix select bootstrap overflow visible --- app/Resources/public/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7a7d78f9d2..1210daed6e 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -5018,7 +5018,7 @@ div#chat-remote-video video { width: 450px !important; } .ui-accordion .ui-accordion-content-active{ - + overflow: visible; } .ui-jqgrid-view .ui-widget-content a{ color:#666666;