diff --git a/main/admin/group_list.php b/main/admin/group_list.php index 90ea9ee69e..0d157957b8 100644 --- a/main/admin/group_list.php +++ b/main/admin/group_list.php @@ -10,7 +10,6 @@ $language_file = array ('registration','admin','userInfo'); $cidReset = true; require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php'; require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php'; @@ -376,7 +375,7 @@ else //$form->addElement('static','search_advanced_link',null,''.get_lang('AdvancedSearch').''); echo '
'; if (api_is_platform_admin()) { - echo ''. + echo ''. ''.Display::return_icon('create_group_social_network.png',get_lang('AddGroups'),'','32').''. ''; } diff --git a/main/auth/profile.php b/main/auth/profile.php index 3662827b98..6438c910d1 100644 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -272,9 +272,7 @@ if (api_get_setting('extended_profile') == 'true') { // PASSWORD if (is_profile_editable() && api_get_setting('profile', 'password') == 'true') { - - $form->addElement('password', 'password0', get_lang('Pass'), array('size' => 40)); - $form->addElement('static', null, null, ''.get_lang('Enter2passToChange').''); + $form->addElement('password', 'password0', array(get_lang('Pass'), get_lang('Enter2passToChange')), array('size' => 40)); $form->addElement('password', 'password1', get_lang('NewPass'), array('size' => 40)); $form->addElement('password', 'password2', get_lang('Confirmation'), array('size' => 40)); // user must enter identical password twice so we can prevent some user errors diff --git a/main/coursecopy/classes/Link.class.php b/main/coursecopy/classes/Link.class.php old mode 100755 new mode 100644 index 0db5044e8b..fd2560e2dc --- a/main/coursecopy/classes/Link.class.php +++ b/main/coursecopy/classes/Link.class.php @@ -60,5 +60,4 @@ class Link extends Resource parent::show(); echo $this->title.' ('.$this->url.')'; } -} -?> +} \ No newline at end of file diff --git a/main/coursecopy/copy_course_session.php b/main/coursecopy/copy_course_session.php old mode 100755 new mode 100644 index 0d7af7568d..8a0efe73bd --- a/main/coursecopy/copy_course_session.php +++ b/main/coursecopy/copy_course_session.php @@ -311,7 +311,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is $cr = new CourseRestorer($course); //$cr->set_file_option($_POST['same_file_name_option']); $cr->restore($destination_course, $destination_session); - Display::display_normal_message(get_lang('CopyFinished')); + Display::display_confirmation_message(get_lang('CopyFinished')); display_form(); } else { @@ -352,7 +352,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is $cr->restore($course_destinatination, $destination_session); //} } - Display::display_normal_message(get_lang('CopyFinished')); + Display::display_confirmation_message(get_lang('CopyFinished')); display_form(); } else { Display::display_error_message(get_lang('YouMustSelectACourseFromOriginalSession')); diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 697bd940b7..9195cb7f29 100644 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -1269,7 +1269,7 @@ function inbox_display() { $action=api_xml_http_response_encode(get_lang('Modify')); $table->set_header(1,api_xml_http_response_encode(get_lang('Messages')),false); //$table->set_header(2,$title,true); - $table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:160px;')); + $table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:180px;')); $table->set_header(3,$action,false,array ('style' => 'width:70px;')); if ($_REQUEST['f']=='social') { diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 21c5a3e05f..f59d771b02 100644 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -141,18 +141,16 @@ function show_compose_reply_to_message($message_id, $receiver_id) { $row = Database::fetch_array($result,'ASSOC'); if (!isset($row['user_sender_id'])) { echo get_lang('InvalidMessageId'); - die(); + exit; } - $pre_html = '
-
'.get_lang('SendMessageTo').'
+
'.get_lang('SendMessageTo').':
'; + $post = '
'; $multi_select = ''; - echo $pre_html.''.GetFullUserName($row['user_sender_id']).''.$post; - //echo get_lang('To').': '. GetFullUserName($row['user_sender_id']).''; - //$default['title'] = get_lang('EnterTitle'); + echo $pre_html.''.GetFullUserName($row['user_sender_id']).''.$post; $default['users'] = array($row['user_sender_id']); manage_form($default); } @@ -183,8 +181,9 @@ function manage_form ($default, $select_from_user_list = null) { if (empty($default['users'])) { //the magic should be here $pre_html = '
-
'.get_lang('SendMessageTo').'
+
'.get_lang('SendMessageTo').'
'; + $post = '
'; $multi_select = ''; diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index e4c5781980..a083e7b9a5 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -3620,6 +3620,7 @@ class learnpath { */ public function toggle_publish($lp_id, $set_visibility = 'v') { //if ($this->debug > 0) { error_log('New LP - In learnpath::toggle_publish()', 0); } + $course_id = api_get_course_int_id(); $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN); $sql = "SELECT * FROM $tbl_lp where c_id = ".$course_id." AND id=$lp_id"; $result = Database::query($sql); @@ -4457,6 +4458,8 @@ class learnpath { */ public function update_display_order() { $lp_table = Database :: get_course_table(TABLE_LP_MAIN); + $course_id = api_get_course_int_id(); + $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order"; $res = Database::query($sql); if ($res === false) @@ -7706,7 +7709,7 @@ class learnpath { $preq_id = $row['prerequisite']; $session_id = api_get_session_id(); $session_condition = api_get_session_condition($session_id); - echo $sql = "SELECT * FROM $tbl_lp WHERE c_id = $course_id $session_condition ORDER BY display_order "; + $sql = "SELECT * FROM $tbl_lp WHERE c_id = $course_id $session_condition ORDER BY display_order "; $rs = Database::query($sql); $return = ''; $return .= '