Format code.

1.10.x
Julio Montoya 10 years ago
parent ca6f821318
commit 8ba03dabfc
  1. 2
      main/admin/course_request_edit.php
  2. 8
      main/exercice/upload_exercise.php
  3. 10
      main/forum/viewforumcategory.php
  4. 1
      main/forum/viewpost.php
  5. 30
      plugin/search_course/lib/search_course_widget.class.php

@ -110,7 +110,6 @@ if ($course_validation_feature) {
// Hidden form fields. // Hidden form fields.
$form->addElement('hidden', 'user_id'); $form->addElement('hidden', 'user_id');
$form->addElement('hidden', 'directory'); $form->addElement('hidden', 'directory');
$form->addElement('hidden', 'db_name');
$form->addElement('hidden', 'visual_code'); $form->addElement('hidden', 'visual_code');
$form->addElement('hidden', 'request_date'); $form->addElement('hidden', 'request_date');
$form->addElement('hidden', 'status'); $form->addElement('hidden', 'status');
@ -120,7 +119,6 @@ if ($course_validation_feature) {
$values['wanted_code'] = $course_request_info['code']; $values['wanted_code'] = $course_request_info['code'];
$values['user_id'] = $course_request_info['user_id']; $values['user_id'] = $course_request_info['user_id'];
$values['directory'] = $course_request_info['directory']; $values['directory'] = $course_request_info['directory'];
$values['db_name'] = $course_request_info['db_name'];
$values['course_language'] = $course_request_info['course_language']; $values['course_language'] = $course_request_info['course_language'];
$values['title'] = $course_request_info['title']; $values['title'] = $course_request_info['title'];
$values['description'] = $course_request_info['description']; $values['description'] = $course_request_info['description'];

@ -74,7 +74,13 @@ function lp_upload_quiz_main() {
// variable initialisation // variable initialisation
$lp_id = isset($_GET['lp_id']) ? Security::remove_XSS($_GET['lp_id']) : null; $lp_id = isset($_GET['lp_id']) ? Security::remove_XSS($_GET['lp_id']) : null;
$form = new FormValidator('upload', 'POST', api_get_self() . '?' . api_get_cidreq() . '&lp_id='.$lp_id, '', array('enctype' => 'multipart/form-data')); $form = new FormValidator(
'upload',
'POST',
api_get_self().'?'.api_get_cidreq().'&lp_id='.$lp_id,
'',
array('enctype' => 'multipart/form-data')
);
$form->addElement('header', get_lang('ImportExcelQuiz')); $form->addElement('header', get_lang('ImportExcelQuiz'));
$form->addElement('file', 'user_upload_quiz', get_lang('FileUpload')); $form->addElement('file', 'user_upload_quiz', get_lang('FileUpload'));

@ -366,11 +366,9 @@ if ($action_forums != 'add') {
$session_displayed = ''; $session_displayed = '';
} }
//$number_forum_topics_and_posts=get_post_topics_of_forum($forum['forum_id']); // deprecated
// the number of topics and posts // the number of topics and posts
$my_number_threads = isset($forum['number_of_threads']) ? $forum['number_of_threads'] : 0 ; $my_number_threads = isset($forum['number_of_threads']) ? $forum['number_of_threads'] : 0;
$my_number_posts = isset($forum['number_of_posts']) ? $forum['number_of_posts'] : 0;
$my_number_posts = isset($forum['number_of_posts']) ? $forum['number_of_posts'] : 0 ;
$html .= '<div class="row">'; $html .= '<div class="row">';
$html .= '<div class="col-md-6">'; $html .= '<div class="col-md-6">';
@ -488,11 +486,13 @@ if ($action_forums != 'add') {
} }
$iconnotify = 'notification_mail_na.png'; $iconnotify = 'notification_mail_na.png';
if (is_array(isset($_SESSION['forum_notification']['forum']) ? $_SESSION['forum_notification']['forum'] : null)) { if (is_array(isset($_SESSION['forum_notification']['forum']) ? $_SESSION['forum_notification']['forum'] : null)) {
if (in_array($forum['forum_id'],$_SESSION['forum_notification']['forum'])) { if (in_array($forum['forum_id'],$_SESSION['forum_notification']['forum'])) {
$iconnotify = 'notification_mail.png'; $iconnotify = 'notification_mail.png';
} }
} }
if (!api_is_anonymous()) { if (!api_is_anonymous()) {
$html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory=' $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
. Security::remove_XSS($_GET['forumcategory']) . '&action=notify&content=forum&id=' . Security::remove_XSS($_GET['forumcategory']) . '&action=notify&content=forum&id='
@ -500,10 +500,8 @@ if ($action_forums != 'add') {
} }
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
$html .= '</div></div>'; $html .= '</div></div>';
} }
echo $html; echo $html;

@ -4,7 +4,6 @@
* @package chamilo.forum * @package chamilo.forum
*/ */
// Including the global initialization file.
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
// The section (tabs). // The section (tabs).

@ -220,8 +220,7 @@ EOT;
*/ */
function display_list($courses) function display_list($courses)
{ {
if (empty($courses)) if (empty($courses)) {
{
return false; return false;
} }
@ -231,15 +230,12 @@ EOT;
$display_teacher = (api_get_setting('display_teacher_in_courselist') == 'true'); $display_teacher = (api_get_setting('display_teacher_in_courselist') == 'true');
echo '<table cellpadding="4">'; echo '<table cellpadding="4">';
foreach ($courses as $key => $course) foreach ($courses as $key => $course) {
{
$details = array(); $details = array();
if ($display_coursecode) if ($display_coursecode) {
{
$details[] = $course['visual_code']; $details[] = $course['visual_code'];
} }
if ($display_teacher) if ($display_teacher) {
{
$details[] = $course['tutor']; $details[] = $course['tutor'];
} }
$details = implode(' - ', $details); $details = implode(' - ', $details);
@ -247,17 +243,20 @@ EOT;
$href = api_get_path(WEB_COURSE_PATH).$course['code'] .'/index.php'; $href = api_get_path(WEB_COURSE_PATH).$course['code'] .'/index.php';
echo '<tr><td><b><a href="' . $href . '">' . "$title</a></b><br/>$details</td><td>"; echo '<tr><td><b><a href="' . $href . '">' . "$title</a></b><br/>$details</td><td>";
if (!api_is_anonymous()) if (!api_is_anonymous()) {
{ if ($course['registration_code']) {
if ($course['registration_code']) Display::display_icon(
{ 'passwordprotected.png',
Display::display_icon('passwordprotected.png', '', array('style' => 'float:left;')); '',
array('style' => 'float:left;')
);
} }
$this->display_subscribe_icon($course, $user_courses); $this->display_subscribe_icon($course, $user_courses);
} }
echo '</td></tr>'; echo '</td></tr>';
} }
echo '</table>'; echo '</table>';
return true; return true;
} }
@ -283,8 +282,7 @@ EOT;
} }
//Not authorized to subscribe //Not authorized to subscribe
if ($current_course['subscribe'] != SUBSCRIBE_ALLOWED) if ($current_course['subscribe'] != SUBSCRIBE_ALLOWED) {
{
echo self::get_lang('SubscribingNotAllowed'); echo self::get_lang('SubscribingNotAllowed');
return false; return false;
} }
@ -360,7 +358,6 @@ EOT;
$result[$code] = array( $result[$code] = array(
'code' => $code, 'code' => $code,
'directory' => $row['directory'], 'directory' => $row['directory'],
'db' => $row['db_name'],
'visual_code' => $row['visual_code'], 'visual_code' => $row['visual_code'],
'title' => $row['title'], 'title' => $row['title'],
'tutor' => $row['tutor_name'], 'tutor' => $row['tutor_name'],
@ -368,6 +365,7 @@ EOT;
'unsubscribe' => $row['unsubscribe'] 'unsubscribe' => $row['unsubscribe']
); );
} }
return $result; return $result;
} }

Loading…
Cancel
Save