From 764cfa78fd77e4c90147424c9f23e6c5594246c0 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 5 Aug 2015 15:00:01 +0200 Subject: [PATCH] Format code. --- main/calendar/download.php | 58 ++++++++++++++++------------- main/calendar/ical_export.php | 1 + main/course_description/add.php | 28 +++++++++++--- main/course_description/edit.php | 29 ++++++++++++--- main/course_description/index.php | 19 +++++----- main/course_description/listing.php | 14 +++---- main/course_home/2column.php | 19 ++++------ main/course_home/3column.php | 6 --- main/course_home/activity.php | 1 + main/course_info/delete_course.php | 5 +-- main/course_info/download.php | 5 +-- main/course_info/infocours.php | 6 +-- 12 files changed, 113 insertions(+), 78 deletions(-) diff --git a/main/calendar/download.php b/main/calendar/download.php index 0014821c4e..1836ab9c7f 100755 --- a/main/calendar/download.php +++ b/main/calendar/download.php @@ -1,5 +1,6 @@ - diff --git a/main/course_description/add.php b/main/course_description/add.php index 85ab1c8e64..cc044f953f 100755 --- a/main/course_description/add.php +++ b/main/course_description/add.php @@ -19,14 +19,18 @@ $categories[ADD_BLOCK] = get_lang('NewBloc'); $i=1; echo '
'; -echo ''.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).''; +echo ''. + Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM). + ''; ksort($categories); foreach ($categories as $id => $title) { if ($i==ADD_BLOCK) { - echo ''.Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).''; + echo ''. + Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).''; break; } else { - echo ''.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).''; + echo ''. + Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).''; $i++; } } @@ -48,13 +52,27 @@ if (!$error) { $token = Security::get_token(); } // display form -$form = new FormValidator('course_description','POST','index.php?action=add&'.api_get_cidreq()); +$form = new FormValidator( + 'course_description', + 'POST', + 'index.php?action=add&'.api_get_cidreq() +); $form->addElement('header', '', $header); $form->addElement('hidden', 'description_type',$description_type); $form->addElement('hidden', 'sec_token',$token); $form->addText('title', get_lang('Title'), true, array('size'=>'width: 350px;')); $form->applyFilter('title','html_filter'); -$form->addHtmlEditor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200')); +$form->addHtmlEditor( + 'contentDescription', + get_lang('Content'), + true, + false, + array( + 'ToolbarSet' => 'TrainingDescription', + 'Width' => '100%', + 'Height' => '200', + ) +); $form->addButtonCreate(get_lang('Save')); // display default questions diff --git a/main/course_description/edit.php b/main/course_description/edit.php index b0ef3378e1..0629707281 100755 --- a/main/course_description/edit.php +++ b/main/course_description/edit.php @@ -23,15 +23,19 @@ $categories[ADD_BLOCK] = get_lang('NewBloc'); $i=1; echo '
'; -echo ''.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).''; +echo ''. + Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM). + ''; ksort($categories); foreach ($categories as $id => $title) { if ($i==ADD_BLOCK) { - echo ''.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).''; + echo ''. + Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).''; break; } else { - echo ''.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).''; + echo ''. + Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).''; $i++; } } @@ -50,7 +54,12 @@ if ($description_type >= ADD_BLOCK) { } // display form -$form = new FormValidator('course_description','POST','index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()); +$form = new FormValidator( + 'course_description', + 'POST', + 'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq( + ) +); $form->addElement('header','',$header); $form->addElement('hidden', 'id', $original_id); @@ -58,7 +67,17 @@ $form->addElement('hidden', 'description_type',$description_type); $form->addElement('hidden', 'sec_token',$token); $form->addText('title', get_lang('Title'), true, array('size'=>'50')); $form->applyFilter('title','html_filter'); -$form->addHtmlEditor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200')); +$form->addHtmlEditor( + 'contentDescription', + get_lang('Content'), + true, + false, + array( + 'ToolbarSet' => 'TrainingDescription', + 'Width' => '100%', + 'Height' => '200', + ) +); $form->addButtonCreate(get_lang('Save')); // Set some default values diff --git a/main/course_description/index.php b/main/course_description/index.php index ec2816f848..e296cf97a0 100755 --- a/main/course_description/index.php +++ b/main/course_description/index.php @@ -2,7 +2,8 @@ /* For licensing terms, see /license.txt */ /** -* Template (front controller in MVC pattern) used for distpaching to the controllers depend on the current action +* Template (front controller in MVC pattern) used for distpaching + * to the controllers depend on the current action * @author Christian Fasanando * @package chamilo.course_description */ @@ -59,26 +60,26 @@ $course_description_controller = new CourseDescriptionController(); // distpacher actions to controller switch ($action) { case 'listing': - $course_description_controller->listing(); - break; + $course_description_controller->listing(); + break; case 'history': $course_description_controller->listing(true); break; - case 'add' : - if (api_is_allowed_to_edit(null,true)) { + case 'add' : + if (api_is_allowed_to_edit(null, true)) { $course_description_controller->add(); } break; - case 'edit' : - if (api_is_allowed_to_edit(null,true)) { + case 'edit' : + if (api_is_allowed_to_edit(null, true)) { $course_description_controller->edit($id, $description_type); } break; case 'delete' : - if (api_is_allowed_to_edit(null,true)) { + if (api_is_allowed_to_edit(null, true)) { $course_description_controller->destroy($id); } break; - default : + default : $course_description_controller->listing(); } diff --git a/main/course_description/listing.php b/main/course_description/listing.php index 0d1791865c..fca200c9e8 100755 --- a/main/course_description/listing.php +++ b/main/course_description/listing.php @@ -21,11 +21,11 @@ if ((isset($messages['edit']) && $messages['edit']) || // display actions menu if (api_is_allowed_to_edit(null,true)) { - $categories = array (); - foreach ($default_description_titles as $id => $title) { - $categories[$id] = $title; - } - $categories[ADD_BLOCK] = get_lang('NewBloc'); + $categories = array(); + foreach ($default_description_titles as $id => $title) { + $categories[$id] = $title; + } + $categories[ADD_BLOCK] = get_lang('NewBloc'); $i=1; echo '
'; @@ -60,12 +60,12 @@ if (isset($descriptions) && count($descriptions) > 0) { if (api_get_session_id() == $description['session_id']) { $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']); - //delete + // delete echo ''; echo Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL); echo ' '; - //edit + // edit echo ''; echo Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL); echo ' '; diff --git a/main/course_home/2column.php b/main/course_home/2column.php index 482023c755..2a490cc2c6 100755 --- a/main/course_home/2column.php +++ b/main/course_home/2column.php @@ -13,10 +13,6 @@ * @package chamilo.course_home */ - - -/* MAIN CODE */ - /* Work with data post askable by admin of course (franglais, clean this) */ $id = isset($_GET['id']) ? intval($_GET['id']) : null; @@ -47,7 +43,7 @@ if (api_is_allowed_to_edit(null, true)) { /* HIDE */ - elseif ($_GET['hide']) { // visibility 1 -> 0 + elseif ($_GET['hide']) { // visibility 1 -> 0 Database::query("UPDATE $tool_table SET visibility=0 WHERE c_id = $course_id AND id='".$id."'"); $show_message .= Display::return_message(get_lang('ToolIsNowHidden'), 'confirmation'); } @@ -119,11 +115,10 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { /* Tools for platform admin only */ if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) { - - $content .='
- '.get_lang('PlatformAdminOnly').' - - '.CourseHome::show_tool_2column(TOOL_PLATFORM_ADMIN).' -
-
'; + $content .='
+ '.get_lang('PlatformAdminOnly').' + + '.CourseHome::show_tool_2column(TOOL_PLATFORM_ADMIN).' +
+
'; } diff --git a/main/course_home/3column.php b/main/course_home/3column.php index 6b711f025e..388b3a74dc 100755 --- a/main/course_home/3column.php +++ b/main/course_home/3column.php @@ -21,11 +21,8 @@ $course_id = api_get_course_int_id(); // WORK with data post askable by admin of course if (api_is_allowed_to_edit(null, true)) { - /* Processing request */ - /* MODIFY HOME PAGE */ - /* * Edit visibility of tools * @@ -186,7 +183,6 @@ if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coa * Process hiding a tools from aivailable tools. * visibility=2 are only viewed by Dokeos Administrator visibility 0,1->2 */ - elseif (isset($delete) && $delete) { Database::query("DELETE FROM $TBL_ACCUEIL WHERE c_id = $course_id AND id = $id AND added_tool=1"); } @@ -216,9 +212,7 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { $content .= "\n\n"; } - /* TOOLS FOR PLATFORM ADMIN ONLY */ - if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) { $content .= ""."". "
". diff --git a/main/course_home/activity.php b/main/course_home/activity.php index 926c971d69..02212f2590 100755 --- a/main/course_home/activity.php +++ b/main/course_home/activity.php @@ -183,5 +183,6 @@ function return_block($title, $content, $class = null)
'.$content.'
'; + return $html; } diff --git a/main/course_info/delete_course.php b/main/course_info/delete_course.php index 2aabb54e86..6c25c38b74 100755 --- a/main/course_info/delete_course.php +++ b/main/course_info/delete_course.php @@ -1,5 +1,6 @@ Jquery support + lots of fixes * @package chamilo.course_info */ + require_once '../inc/global.inc.php'; $current_course_tool = TOOL_COURSE_SETTING; $this_section = SECTION_COURSES; @@ -35,7 +36,8 @@ $courseId = api_get_course_int_id(); $course_access_settings = CourseManager:: get_access_settings($course_code); //LOGIC FUNCTIONS -function is_settings_editable() { +function is_settings_editable() +{ return isset($GLOBALS['course_info_is_editable']) && $GLOBALS['course_info_is_editable']; } @@ -441,9 +443,7 @@ if ($form->validate() && is_settings_editable()) { $num = CourseManager::countActiveCourses($urlId); if ($num >= $_configuration[$urlId]['hosting_limit_active_courses']) { api_warn_hosting_contact('hosting_limit_active_courses'); - api_set_failure(get_lang('PortalActiveCoursesLimitReached')); - $url = api_get_path(WEB_CODE_PATH).'course_info/infocours.php?action=course_active_warning&cidReq='.$course_code; header("Location: $url"); exit;