chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix course filter and style issues - refs #7528

Browse Source
1.10.x
Imanol Losada 11 years ago
parent 7e86a07253
commit 529629203d
1 changed files with 62 additions and 65 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 129
      plugin/buycourses/src/function.php

129
plugin/buycourses/src/function.php
Unescape View File

@ -230,9 +230,9 @@ if ($_REQUEST['tab'] == 'sessions_filter') {
} }
if ($_REQUEST['tab'] == 'courses_filter') { if ($_REQUEST['tab'] == 'courses_filter') {
$course = Database::escape_string($_REQUEST['course']); $course = isset($_REQUEST['course']) ? Database::escape_string($_REQUEST['course']) : '';
$priceMin = Database::escape_string($_REQUEST['pricemin']); $priceMin = isset($_REQUEST['pricemin']) ? floatval($_REQUEST['pricemin']) : 0;
$priceMax = Database::escape_string($_REQUEST['pricemax']); $priceMax = isset($_REQUEST['pricemax']) ? floatval($_REQUEST['pricemax']) : 0;
/** /**
* Deprecated since 2014-10-14 * Deprecated since 2014-10-14
*/ */
@ -240,44 +240,30 @@ if ($_REQUEST['tab'] == 'courses_filter') {
$category = Database::escape_string($_REQUEST['category']); $category = Database::escape_string($_REQUEST['category']);
$server = api_get_path(WEB_PATH); $server = api_get_path(WEB_PATH);
$filter = ''; $sql = "SELECT a.course_id, a.visible, a.price, b.*
if ($course != '') { FROM $tableBuyCourse a, $tableCourse b
$filter .= "b.title LIKE '%" . $course . "%'"; WHERE a.course_id = b.id AND a.session_id = 0
} AND a.visible = 1;";
if ($priceMin != '') {
if ($filter == '') {
$filter .= "a.price >= '" . $priceMin . "'";
} else {
$filter .= " AND a.price >= '" . $priceMin . "'";
}
}
if ($priceMax != '') { $filter = "";
if ($filter == '') { if (!empty($course)) {
$filter .= "a.price <= '" . $priceMax . "'"; $filter .= " AND b.title LIKE '%".$course."%'";
} else {
$filter .= " AND a.price <= '" . $priceMax . "'";
} }
if ($priceMin > 0) {
$filter .= " AND a.price >= ".$priceMin;
} }
if ($category != '') { if ($priceMax > 0) {
if ($filter == '') { $filter .= " AND a.price <= ".$priceMax;
$filter .= "b.category_code='" . $category . "'";
} else {
$filter .= " AND b.category_code='" . $category . "'";
} }
if (!empty($category)) {
$filter .= " AND b.category_code = '".$category."'";
} }
if ($filter == '') { if (!empty($filter)) {
$sql = "SELECT a.course_id, a.visible, a.price, b.* $sql = substr_replace($sql, $filter.";", -1);
FROM $tableBuyCourse a, $tableCourse b
WHERE a.course_id = b.id AND a.session_id = 0
AND a.visible = 1;";
} else {
$sql = "SELECT a.course_id, a.visible, a.price, b.*
FROM $tableBuyCourse a, $tableCourse b
WHERE a.course_id = b.id AND a.session_id = 0
AND a.visible = 1 AND " . $filter . ";";
} }
$res = Database::query($sql); $res = Database::query($sql);
@ -288,7 +274,7 @@ if ($_REQUEST['tab'] == 'courses_filter') {
FROM $tableCourseRelUser a, $tableUser b FROM $tableCourseRelUser a, $tableUser b
WHERE a.course_code = '" . $row['code'] . "' WHERE a.course_code = '" . $row['code'] . "'
AND a.role <> '' AND a.role <> ''
AND a.role <> 'NULL' AND a.role IS NOT NULL
AND a.user_id = b.user_id;"; AND a.user_id = b.user_id;";
$tmp = Database::query($sql); $tmp = Database::query($sql);
@ -330,41 +316,52 @@ if ($_REQUEST['tab'] == 'courses_filter') {
$currencyType = findCurrency(); $currencyType = findCurrency();
$content = ''; $content = '';
foreach ($aux as $course) { foreach ($aux as $course) {
$content .= '<div class="well_border span8">'; $content .= '
$content .= '<div class="row">'; <div class="span8">
$content .= '<div class="span">'; <div class="row well-course">
$content .= '<div class="thumbnail">'; <div class="span1 icon-course">
$content .= '<a class="ajax" rel="gb_page_center[778]" title=""'; <div class="thumbnail">
$content .= 'href="'.$server.'plugin/buycourses/src/ajax.php?'; <a class="ajax" rel="gb_page_center[778]" title=""
$content .= 'a=show_course_information&code='.$course['code'].'">'; href="'.$server.'plugin/buycourses/src/ajax.php?
$content .= '<img alt="" src="'.$server.$course['course_img'].'">'; a=show_course_information&code='.$course['code'].'">
$content .= '</a>'; <img alt="" src="'.$server.$course['course_img'].'">
$content .= '</div>'; </a>
$content .= '</div>'; </div>
$content .= '<div class="span4">'; </div>
$content .= '<div class="categories-course-description">'; <div class="span3">
$content .= '<h3>'.$course['title'].'</h3>'; <div class="categories-course-description">
$content .= '<h5>'.get_lang('Teacher').': '.$course['teacher'].'</h5>'; <h3>'.$course['title'].'</h3>
$content .= '</div>'; <h5>'.get_lang('Teacher').': '.$course['teacher'].'</h5>
</div>';
if ($course['enrolled'] == "YES") { if ($course['enrolled'] == "YES") {
$content .= '<span class="label label-info">'.$plugin->get_lang('TheUserIsAlreadyRegisteredInTheCourse').'</span>'; $content .= '<span class="label label-info">'.$plugin->get_lang('TheUserIsAlreadyRegisteredInTheCourse').'</span>';
} }
$content .= '</div>'; if ($course['enrolled'] == "TMP") {
$content .= '<div class="span right">'; $content .= '<span class="label label-warning">'.$plugin->get_lang('WaitingToReceiveThePayment').'</span>';
$content .= '<div class="sprice right">'.$course['price'].' '.$currencyType.'</div>'; }
$content .= '<div class="cleared"></div>'; $content .= '</div>
$content .= '<div class="btn-toolbar right">'; <div class="span3 right">
$content .= '<a class="ajax btn btn-primary" title=""'; <div class="sprice right">'.
$content .= 'href="'.$server.'plugin/buycourses/src/ajax.php?'; $course['price'].' '.$currencyType.'
$content .= 'a=show_course_information&code='.$course['code'].'">'.get_lang('Description').'</a>&nbsp;'; </div>
<div class="cleared">
</div>
<div class="btn-group right">
<a class="ajax btn btn-primary" title=""
href="'.$server.'plugin/buycourses/src/ajax.php?
a=show_course_information&code='.$course['code'].'">'.
get_lang('Description').
'</a>';
if ($course['enrolled'] != "YES") { if ($course['enrolled'] != "YES") {
$content .= '<a class="btn btn-success" title=""'; $content .= '<a class="btn btn-success" title=""
$content .= 'href="'.$server.'plugin/buycourses/src/process.php?code='.$course['id'].'">'.$buy_name.'</a>'; href="'.$server.'plugin/buycourses/src/process.php?code='.$course['id'].'">'.
} $buy_name.
$content .= '</div>'; '</a>';
$content .= '</div>'; }
$content .= '</div>'; $content .= '</div>
$content .= '</div>'; </div>
</div>
</div>';
} }
echo json_encode(array("status" => "true", "content" => $content)); echo json_encode(array("status" => "true", "content" => $content));
} }

Write Preview
Loading…
Cancel
Save