Browse Source

Validating setting allow_user_course_subscription_by_course_admin see BT#5020

Julio Montoya 12 years ago
parent
commit
7eb3eeb6be
3 changed files with 22 additions and 3 deletions
  1. 7 1
      main/user/subscribe_user.php
  2. 9 2
      main/user/user.php
  3. 6 0
      main/user/user_import.php

+ 7 - 1
main/user/subscribe_user.php

@@ -19,6 +19,12 @@ $this_section = SECTION_COURSES;
 // notice for unauthorized people.
 api_protect_course_script(true);
 
+if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'false') {
+    if (!api_is_platform_admin()) {
+        api_not_allowed(true);
+    }
+}
+
 // access restriction
 if (!api_is_allowed_to_edit()) {
 	 api_not_allowed(true);
@@ -644,7 +650,7 @@ function active_filter($active, $url_params, $row) {
 		$image='error';
 	}
 	if ($row['0']<>$_user['user_id']) { // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = '<center>'.Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array('border'=>'0', 'style'=>'vertical-align: middle;') , 16).'</center>';
+		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
 	}
 	return $result;
 }

+ 9 - 2
main/user/user.php

@@ -404,11 +404,18 @@ if ( api_is_allowed_to_edit(null, true)) {
     }
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&amp;type=csv">'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&amp;type=xls">'.Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
-    $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'.Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+    
+    if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' or api_is_platform_admin()) {
+        $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'.Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+    }
+    
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&type=pdf">'.Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> ';
     $actions .= "<a href=\"../group/group.php?".api_get_cidreq()."\">".Display::return_icon('group.png', get_lang("GroupUserManagement"),'',ICON_SIZE_MEDIUM)."</a>";
     
-    $actions .= ' <a class="btn" href="class.php?'.api_get_cidreq().'">'.get_lang('Classes').'</a>';    
+    if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' or api_is_platform_admin()) {
+        $actions .= ' <a class="btn" href="class.php?'.api_get_cidreq().'">'.get_lang('Classes').'</a>';    
+    }
+    
     //$actions .= ' <a class="btn" href="social_groups.php?'.api_get_cidreq().'">'.get_lang('SocialGroups').'</a>';
 		
 	// Build search-form

+ 6 - 0
main/user/user_import.php

@@ -11,6 +11,12 @@ $this_section = SECTION_COURSES;
 // notice for unauthorized people.
 api_protect_course_script(true);
 
+if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'false') {
+    if (!api_is_platform_admin()) {
+        api_not_allowed(true);
+    }
+}
+
 $tool_name = get_lang('ImportUsersToACourse');
 
 $interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang("Users"));