From c5e59d0ca878c144d98c72ddbb90706a478e247b Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 22 Jul 2015 11:19:14 +0200 Subject: [PATCH] Format code, fix PHP warnings, --- main/admin/careers.php | 45 ++++++++++++++++----- main/admin/configure_inscription.php | 1 - main/admin/statistics.php | 9 ++--- main/admin/user_import.php | 2 +- main/admin/user_list.php | 45 ++++++++------------- main/admin/user_update_import.php | 4 +- main/inc/lib/sessionmanager.lib.php | 17 ++++---- main/inc/lib/zombie/zombie_report.class.php | 2 +- main/session/session_list.php | 15 ++++--- main/work/work.lib.php | 4 +- 10 files changed, 82 insertions(+), 62 deletions(-) diff --git a/main/admin/careers.php b/main/admin/careers.php index 678b522295..7609691d49 100755 --- a/main/admin/careers.php +++ b/main/admin/careers.php @@ -4,6 +4,7 @@ /** * @package chamilo.admin */ + $cidReset = true; require_once '../inc/global.inc.php'; @@ -15,8 +16,14 @@ api_protect_admin_script(); $htmlHeadXtra[] = api_get_jqgrid_js(); // setting breadcrumbs -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); -$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions')); +$interbreadcrumb[] = array( + 'url' => 'index.php', + 'name' => get_lang('PlatformAdmin'), +); +$interbreadcrumb[] = array( + 'url' => 'career_dashboard.php', + 'name' => get_lang('CareersAndPromotions'), +); $action = isset($_GET['action']) ? $_GET['action'] : null; @@ -25,12 +32,13 @@ $token = Security::get_token(); if ($action == 'add') { $interbreadcrumb[]=array('url' => 'careers.php','name' => get_lang('Careers')); - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add')); + $tool_name = get_lang('Add'); } elseif ($action == 'edit') { $interbreadcrumb[]=array('url' => 'careers.php','name' => get_lang('Careers')); $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit')); + $tool_name = get_lang('Edit'); } else { - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Careers')); + $tool_name = get_lang('Careers'); } // The header. @@ -43,10 +51,28 @@ $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_careers'; $columns = array(get_lang('Name'), get_lang('Description'), get_lang('Actions')); // Column config -$column_model = array( - array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'), - array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'), - array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false') +$column_model = array( + array( + 'name' => 'name', + 'index' => 'name', + 'width' => '80', + 'align' => 'left', + ), + array( + 'name' => 'description', + 'index' => 'description', + 'width' => '500', + 'align' => 'left', + 'sortable' => 'false', + ), + array( + 'name' => 'actions', + 'index' => 'actions', + 'width' => '100', + 'align' => 'left', + 'formatter' => 'action_formatter', + 'sortable' => 'false', + ), ); //Autowidth $extra_params['autowidth'] = 'true'; @@ -95,7 +121,8 @@ switch ($action) { $career->display(); } else { echo '
'; - echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; + echo ''. + Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; echo '
'; $form->addElement('hidden', 'sec_token'); $form->setConstants(array('sec_token' => $token)); diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php index 9bc0732f51..c806a29dbf 100755 --- a/main/admin/configure_inscription.php +++ b/main/admin/configure_inscription.php @@ -315,7 +315,6 @@ if (api_get_setting('allow_terms_conditions') == 'true') { } } -//$form->addElement('style_submit_button', 'submit', get_lang('RegisterUser'), array('disabled' => 'disabled')); $form->addButtonSave(get_lang('RegisterUser')); $defaults['status'] = STUDENT; diff --git a/main/admin/statistics.php b/main/admin/statistics.php index ce910eedc3..cbe916ac6f 100755 --- a/main/admin/statistics.php +++ b/main/admin/statistics.php @@ -1,14 +1,13 @@ -addElement('text', 'keyword', get_lang('Keyword'), array('id' => 'user-search-keyword')); +$form->addElement('text', 'keyword'); $form->addButtonSearch(get_lang('Search')); $form->addElement( 'static', @@ -773,28 +773,17 @@ while ($row_admin = Database::fetch_row($res_admin)) { } // Display Advanced search form. -$form = new FormValidator('advanced_search', 'get'); +$form = new FormValidator('advanced_search', 'get', '', '', array(), FormValidator::LAYOUT_HORIZONTAL); $form->addElement('html',''); $form = $form->returnForm(); -$table = new SortableTable('users', 'get_number_of_users', 'get_user_data', (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2); +$table = new SortableTable( + 'users', + 'get_number_of_users', + 'get_user_data', + (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2 +); $table->set_additional_parameters($parameters); $table->set_header(0, '', false, 'width="18px"'); $table->set_header(1, get_lang('Photo'), false); diff --git a/main/admin/user_update_import.php b/main/admin/user_update_import.php index b3d7bc4df0..8970c08f0a 100644 --- a/main/admin/user_update_import.php +++ b/main/admin/user_update_import.php @@ -10,7 +10,7 @@ */ $cidReset = true; -require '../inc/global.inc.php'; +require_once '../inc/global.inc.php'; // Set this option to true to enforce strict purification for usenames. $purification_option_for_usernames = false; @@ -336,7 +336,7 @@ api_protect_admin_script(true, null, 'login'); $defined_auth_sources[] = PLATFORM_AUTH_SOURCE; -if (is_array($extAuthSource)) { +if (isset($extAuthSource) && is_array($extAuthSource)) { $defined_auth_sources = array_merge($defined_auth_sources, array_keys($extAuthSource)); } diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 572dfbd353..2c3aacfe35 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -447,8 +447,10 @@ class SessionManager $categories = self::get_all_session_category(); $orderedCategories = array(); - foreach ($categories as $category) { - $orderedCategories[$category['id']] = $category['name']; + if (!empty($categories)) { + foreach ($categories as $category) { + $orderedCategories[$category['id']] = $category['name']; + } } $formatted_sessions = array(); @@ -509,7 +511,8 @@ class SessionManager } } $formatted_sessions[$session_id] = $session; - $formatted_sessions[$session_id]['category_name'] = $orderedCategories[$session['session_category_id']]; + $categoryName = isset($orderedCategories[$session['session_category_id']]) ? $orderedCategories[$session['session_category_id']] : ''; + $formatted_sessions[$session_id]['category_name'] = $categoryName; } } return $formatted_sessions; @@ -6689,10 +6692,10 @@ class SessionManager get_lang('Visibility'), ); $column_model = array ( - array('name'=>'name', 'index'=>'s.name', 'width'=>'180', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)), - array('name'=>'category_name', 'index'=>'category_name', 'width'=>'20', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)), - array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'70', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)), - array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'70', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)), + array('name'=>'name', 'index'=>'s.name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)), + array('name'=>'category_name', 'index'=>'category_name', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)), + array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)), + array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)), array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'), ); break; diff --git a/main/inc/lib/zombie/zombie_report.class.php b/main/inc/lib/zombie/zombie_report.class.php index 18a468f9d7..6062d4913c 100755 --- a/main/inc/lib/zombie/zombie_report.class.php +++ b/main/inc/lib/zombie/zombie_report.class.php @@ -61,7 +61,7 @@ class ZombieReport implements Countable ), array( 'name' => 'submit_button', - 'type' => 'style_submit_button', + 'type' => 'button', 'value' => get_lang('Search'), 'attributes' => array('class' => 'search') ) diff --git a/main/session/session_list.php b/main/session/session_list.php index 64bfde1a42..19ba7edc77 100644 --- a/main/session/session_list.php +++ b/main/session/session_list.php @@ -34,8 +34,6 @@ if ($action == 'delete') { exit(); } -//$interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin')); - $tool_name = get_lang('SessionList'); Display::display_header($tool_name); @@ -49,7 +47,14 @@ if (!empty($courseId)) { $courseList[$courseInfo['code']] = $parents . $courseInfo['title']; } -$sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE); +$sessionFilter = new FormValidator( + 'course_filter', + 'get', + '', + '', + array(), + FormValidator::LAYOUT_INLINE +); $sessionFilter->addElement( 'select_ajax', 'course_name', @@ -96,10 +101,10 @@ $result = SessionManager::getGridColumns($list_type); $columns = $result['columns']; $column_model = $result['column_model']; -//Autowidth +// Autowidth $extra_params['autowidth'] = 'true'; -//height auto +// height auto $extra_params['height'] = 'auto'; $extra_params['postData'] =array( diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 575e845ef3..9cc82dfaf4 100755 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -98,10 +98,10 @@ function settingsForm($defaults) $form->createElement('radio', 'student_delete_own_publication', null, get_lang('No'), 0) ); $form->addGroup($group, '', get_lang('StudentAllowedToDeleteOwnPublication')); - $form->addElement('button', 'submit', get_lang('Save')); + $form->addButtonSave(get_lang('Save')); $form->setDefaults($defaults); - return $form->return_form(); + return $form->returnForm(); } /**