Browse Source

Adding fixes from 1.9.x

Julio Montoya 11 years ago
parent
commit
99305282d6

+ 7 - 12
main/admin/access_url_add_courses_to_url.php

@@ -21,9 +21,6 @@ if (!api_get_multiple_access_url()) {
 	exit;
 }
 
-/*
-	Global constants and variables
-*/
 
 $form_sent = 0;
 $first_letter_course = '';
@@ -43,15 +40,18 @@ $interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('Mult
 
 /*		MAIN CODE   */
 
-Display :: display_header($tool_name);
+Display::display_header($tool_name);
 
 echo '<div class="actions">';
-echo Display::url(Display::return_icon('edit.gif',get_lang('EditCoursesToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php"');
+echo Display::url(
+    Display::return_icon('edit.png', get_lang('EditCoursesToURL'), ''),
+    api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php'
+);
 echo '</div>';
 
 api_display_tool_title($tool_name);
 
-if ($_POST['form_sent']) {
+if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 	$form_sent = $_POST['form_sent'];
 	$courses = is_array($_POST['course_list']) ? $_POST['course_list'] : array() ;
 	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
@@ -79,8 +79,7 @@ if(empty($first_letter_user)) {
 	$sql = "SELECT count(*) as num_courses FROM $tbl_course";
 	$result = Database::query($sql);
 	$num_row = Database::fetch_array($result);
-	if($num_row['num_courses']>1000)
-	{//if there are too much num_courses to gracefully handle with the HTML select list,
+    if ($num_row['num_courses']>1000) {
 	 // assign a default filter on users names
 		$first_letter_user = 'A';
 	}
@@ -153,8 +152,4 @@ unset($result);
  </table>
 </form>
 <?php
-/*
-		FOOTER
-*/
 Display :: display_footer();
-?>

+ 4 - 6
main/admin/access_url_add_users_to_url.php

@@ -20,9 +20,6 @@ if (!api_get_multiple_access_url()) {
 	exit;
 }
 
-/*
-	Global constants and variables
-*/
 
 $form_sent = 0;
 $first_letter_user = '';
@@ -45,7 +42,9 @@ $interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('Mult
 Display :: display_header($tool_name);
 
 echo '<div class="actions">';
-echo Display::url(Display::return_icon('edit.gif',get_lang('EditUsersToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php">');
+echo Display::url(
+    Display::return_icon('edit.png', get_lang('EditUsersToURL'),''),
+    api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php');
 echo '</div>';
 
 api_display_tool_title($tool_name);
@@ -60,8 +59,7 @@ if ($_POST['form_sent']) {
 		$users[$key] = intval($value);
 	}
 
-	if ($form_sent == 1)
-	{
+	if ($form_sent == 1) {
 		if ( count($users) == 0 || count($url_list) == 0) {
 			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
 			//header('Location: access_urls.php?action=show_message&message='.get_lang('AtLeastOneUserAndOneURL'));

+ 21 - 1
main/inc/lib/api.lib.php

@@ -160,9 +160,25 @@ define('DIR_HOTPOTATOES','/HotPotatoes_files');
 // Event logs types
 define('LOG_COURSE_DELETE',                     'course_deleted');
 define('LOG_COURSE_CREATE',                     'course_created');
+define('LOG_GROUP_PORTAL_CREATED',			    'soc_gr_created');
+define('LOG_GROUP_PORTAL_UPDATED',			    'soc_gr_updated');
+define('LOG_GROUP_PORTAL_DELETED',			    'soc_gr_deleted');
+define('LOG_GROUP_PORTAL_USER_DELETE_ALL',		'soc_gr_delete_users');
+
+define('LOG_GROUP_PORTAL_ID',			        'soc_gr_portal_id');
+define('LOG_GROUP_PORTAL_REL_USER_ARRAY',		'soc_gr_user_array');
+
+define('LOG_GROUP_PORTAL_USER_SUBSCRIBED',  	'soc_gr_u_subs');
+define('LOG_GROUP_PORTAL_USER_UNSUBSCRIBED',	'soc_gr_u_unsubs');
+define('LOG_GROUP_PORTAL_USER_UPDATE_ROLE',		'soc_gr_update_role');
+
+define('LOG_USER_DELETE',                       'user_deleted');
 define('LOG_USER_CREATE',                       'user_created');
+define('LOG_USER_ENABLE',                       'user_enable');
+define('LOG_USER_DISABLE',                      'user_disable');
+define('LOG_USER_FIELD_CREATE',			        'user_field_created');
+define('LOG_USER_FIELD_DELETE',			        'user_field_deleted');
 define('LOG_USER_UPDATED',                      'user_updated');
-define('LOG_USER_DELETE',                       'user_deleted');
 define('LOG_USER_ACTIVATED',                    'user_activated');
 define('LOG_USER_DEACTIVATED',                  'user_deactivated');
 
@@ -182,10 +198,13 @@ define('LOG_PROMOTION_DELETE',                  'promotion_deleted');
 define('LOG_CAREER_CREATE',                     'career_created');
 define('LOG_CAREER_DELETE',                     'career_deleted');
 
+define('LOG_USER_PERSONAL_DOC_DELETED',         'user_doc_deleted');
+define('LOG_WIKI_ACCESS',                       'wiki_page_view');
 // Event logs data types
 define('LOG_COURSE_CODE',                       'course_code');
 define('LOG_USER_ID',                           'user_id');
 define('LOG_USER_OBJECT',                       'user_object');
+define('LOG_USER_FIELD_VARIABLE',		        'user_field_variable');
 define('LOG_SESSION_ID',                        'session_id');
 define('LOG_SESSION_CATEGORY_ID',               'session_category_id');
 define('LOG_CONFIGURATION_SETTINGS_CATEGORY',   'settings_category');
@@ -198,6 +217,7 @@ define('LOG_GRADEBOOK_LOCKED',                   'gradebook_locked');
 define('LOG_GRADEBOOK_UNLOCKED',                 'gradebook_unlocked');
 define('LOG_GRADEBOOK_ID',                       'gradebook_id');
 
+define('LOG_WIKI_PAGE_ID',                       'wiki_page_id');
 define('USERNAME_PURIFIER', '/[^0-9A-Za-z_\.]/');
 
 //used when login_is_email setting is true